In narrow mode, print "All languages" heading if suggested languages are given

Also changed one instance of "Common languages" to "Suggested languages" in
the no-i18n fallback code.
This commit is contained in:
Niklas Laxström
2016-08-30 15:12:46 +02:00
parent 8e82cfd515
commit 0e253cb312
3 changed files with 16 additions and 4 deletions

View File

@@ -13,6 +13,7 @@
"uls-region-AS": "Asia",
"uls-region-ME": "Middle East",
"uls-region-PA": "Pacific",
"uls-region-all": "All languages",
"uls-no-results-found": "No results found",
"uls-common-languages": "Suggested languages",
"uls-no-results-suggestion-title": "You may be interested in:",

View File

@@ -14,6 +14,7 @@
"uls-region-AS": "Label for Asia",
"uls-region-ME": "Label for Middle East",
"uls-region-PA": "Label for Pacific",
"uls-region-all": "Label for all languages in narrow mode, where languages are not split by region.",
"uls-no-results-found": "Title text for 'No results found' section",
"uls-common-languages": "The ULS tries to guess the langugages that the user is most likely to pick. They are taken from geolocation (languages of the current country according to the IP address), previously selected languages, and the browser's accept-language. The list of these languages appears at the top of the ULS languages list, above the geographical regions. This is the title of that list.\n\nSee also {{msg-mw|Mobile-frontend-languages-structured-overlay-suggested-languages-header}}",
"uls-no-results-suggestion-title": "Title for language suggestion in 'no results found' screen",

View File

@@ -109,8 +109,9 @@
},
render: function () {
var $section,
var $section, $quicklist,
lcd = this,
narrowMode = this.options.columns === 1,
regions = [],
regionNames = {
// These are fallback text when i18n library not present
@@ -124,7 +125,16 @@
PA: 'Pacific'
};
regions.push( this.buildQuicklist() );
$quicklist = this.buildQuicklist();
regions.push( $quicklist );
if ( narrowMode && $quicklist.length ) {
regions.push( $( '<h3>' )
.attr( 'data-i18n', 'uls-region-all' )
.addClass( 'uls-lcd-region-title' )
.text( 'All languages' )
);
}
$.each( $.uls.data.regiongroups, function ( regionCode ) {
lcd.regionLanguages[ regionCode ] = [];
@@ -139,7 +149,7 @@
.attr( 'id', regionCode );
// Show a region heading, unless we are using a narrow ULS
if ( lcd.options.columns !== 1 ) {
if ( !narrowMode ) {
$section.append( $( '<h3>' )
.attr( 'data-i18n', 'uls-region-' + regionCode )
.addClass( 'uls-lcd-region-title' )
@@ -323,7 +333,7 @@
$quickListSectionTitle = $( '<h3>' )
.attr( 'data-i18n', 'uls-common-languages' )
.addClass( 'uls-lcd-region-title' )
.text( 'Common languages' ); // This is placeholder text if jquery.i18n not present
.text( 'Suggested languages' ); // This is placeholder text if jquery.i18n not present
$quickListSection.append( $quickListSectionTitle );
this.renderRegion(