Merge pull request #1 from wikimedia/master

Update from origin master
This commit is contained in:
Volker E
2017-10-09 19:42:51 -07:00
committed by GitHub
8 changed files with 37 additions and 20 deletions

View File

@@ -103,13 +103,6 @@
vertical-align: middle; vertical-align: middle;
} }
/* TODO: ugly hack that forces last matching search results to shift down.
* They should be hidden properly.
*/
.uls-no-results-view {
height: 100%;
}
.uls-no-results-found-title { .uls-no-results-found-title {
font-size: 16px; font-size: 16px;
padding: 0 16px 0 28px; padding: 0 16px 0 28px;

16
i18n/hoc.json Normal file
View File

@@ -0,0 +1,16 @@
{
"@metadata": {
"authors": [
"Singkiring57"
]
},
"uls-region-WW": "𑢫𑣉𑣒𑣁 𑣉𑣕𑣈 𑣜𑣈",
"uls-region-SP": "𑢨𑣓𑣈𑣕𑣁𑣊",
"uls-region-AM": "𑢡𑣖𑣈𑣜𑣂𑣌𑣁",
"uls-region-AF": "𑢡𑣘𑣗𑣜𑣂𑣌𑣁",
"uls-region-EU": "𑢥𑣃𑣜𑣉𑣉𑣘",
"uls-region-AS": "𑢨𑣈𑣞𑣂𑣅𑣁",
"uls-region-all": "𑢾𑣗𑣈𑣓 𑣎𑣈𑣋𑣁𑣜 𑣌𑣉",
"uls-no-results-found": "𑢮𑣁𑣓𑣄 𑣌𑣁 𑣓𑣖 𑣎𑣓𑣁",
"uls-search-placeholder": "𑢶𑣂𑣈𑣑 𑣎𑣈𑣋𑣁𑣓 𑣓𑣈𑣚-𑣓𑣖𑣈"
}

View File

@@ -4,7 +4,9 @@
"Amazigh84", "Amazigh84",
"Mmistmurt", "Mmistmurt",
"Mezgoug", "Mezgoug",
"Belkacem77" "Belkacem77",
"SlimaneAmiri",
"Sayem AtVkm"
] ]
}, },
"uls-region-WW": "Deg umaḍal meṛṛa", "uls-region-WW": "Deg umaḍal meṛṛa",
@@ -19,6 +21,6 @@
"uls-no-results-found": "Ulac d acu i d-yufa.", "uls-no-results-found": "Ulac d acu i d-yufa.",
"uls-common-languages": "Tutlayin yettusumren", "uls-common-languages": "Tutlayin yettusumren",
"uls-no-results-suggestion-title": "Ma tebɣiḍ ad tisineḍ ayen nniḍen ɣef :", "uls-no-results-suggestion-title": "Ma tebɣiḍ ad tisineḍ ayen nniḍen ɣef :",
"uls-search-help": "Tzemreḍ ad tnadiḍ s yisem n tutlayt, s uskript, s tengalt ISO n tutlayt neγ inig s tmnaḍt.", "uls-search-help": "Tzemreḍ ad tnadiḍ s yisem n tutlayt, s uskript, s tengalt ISO n tutlayt neγ inig s temnaḍt.",
"uls-search-placeholder": "Anadi n tutlayt" "uls-search-placeholder": "Nadi γef tutlayt"
} }

View File

@@ -4,7 +4,8 @@
"George Animal", "George Animal",
"Bikarhêner", "Bikarhêner",
"Ghybu", "Ghybu",
"Velg" "Velg",
"Cûndûllah el-Kurdî"
] ]
}, },
"uls-region-WW": "Li hemû cîhanê", "uls-region-WW": "Li hemû cîhanê",
@@ -16,7 +17,7 @@
"uls-region-ME": "Rojhilata Navîn", "uls-region-ME": "Rojhilata Navîn",
"uls-region-PA": "Pasîfîk", "uls-region-PA": "Pasîfîk",
"uls-region-all": "Hemû ziman", "uls-region-all": "Hemû ziman",
"uls-no-results-found": "Ti encam nehatin dîtin", "uls-no-results-found": "Tu encam nehatin dîtin",
"uls-common-languages": "Zimanên pêşniyarkirî", "uls-common-languages": "Zimanên pêşniyarkirî",
"uls-no-results-suggestion-title": "Pêwendîya we dikara bikişîne:", "uls-no-results-suggestion-title": "Pêwendîya we dikara bikişîne:",
"uls-search-help": "Hûn lêgerîna xwe li gor nava zimanê, koda ISOyê an jî li gor herêmê dikarin bikin.", "uls-search-help": "Hûn lêgerîna xwe li gor nava zimanê, koda ISOyê an jî li gor herêmê dikarin bikin.",

View File

@@ -13,9 +13,10 @@
"uls-region-AS": "एसिया", "uls-region-AS": "एसिया",
"uls-region-ME": "मध्य पूर्व", "uls-region-ME": "मध्य पूर्व",
"uls-region-PA": "प्रशान्त", "uls-region-PA": "प्रशान्त",
"uls-region-all": "सबै भाषाहरू",
"uls-no-results-found": "कुनै पनि नतिजाहरू भेटिएन", "uls-no-results-found": "कुनै पनि नतिजाहरू भेटिएन",
"uls-common-languages": "साझा भाषा", "uls-common-languages": "सुझाव दिइएका भाषाहरू",
"uls-no-results-suggestion-title": "तपाईंलाई यसमा चाख लाग्नसक्छ:", "uls-no-results-suggestion-title": "तपाईंलाई यसमा चाख लाग्नसक्छ:",
"uls-search-help": "तपाईं भाषाको नाम, लिपीको नाम, आइएसओ कोड वा क्षेत्रको आधारमा खोज्न सक्नुहुन्छ:", "uls-search-help": "तपाईं भाषाको नाम, लिपीको नाम, आइएसओ कोड वा क्षेत्रको आधारमा खोज्न सक्नुहुन्छ या क्षेत्रको आधारमा अन्वेषण गर्न सक्नुहुन्छ:",
"uls-search-placeholder": "भाषा खोज्नुहोस" "uls-search-placeholder": "भाषा खोज्नुहोस"
} }

View File

@@ -13,6 +13,7 @@
"uls-region-AS": "ایشیا", "uls-region-AS": "ایشیا",
"uls-region-ME": "مشرق وسطی", "uls-region-ME": "مشرق وسطی",
"uls-region-PA": "بحر الکاہل", "uls-region-PA": "بحر الکاہل",
"uls-region-all": "تمام زبانیں",
"uls-no-results-found": "مطلوبہ نتائج نہیں ملے", "uls-no-results-found": "مطلوبہ نتائج نہیں ملے",
"uls-common-languages": "تجویز کردہ زبانیں", "uls-common-languages": "تجویز کردہ زبانیں",
"uls-no-results-suggestion-title": "شاید آپ ان میں دلچسپی لیں:", "uls-no-results-suggestion-title": "شاید آپ ان میں دلچسپی لیں:",

View File

@@ -221,7 +221,7 @@
}, },
/** /**
* callback for results found context. * Callback for results found context.
*/ */
success: function () { success: function () {
this.$resultsView.show(); this.$resultsView.show();

View File

@@ -31,7 +31,6 @@
.addClass( 'uls-no-results-found-title' ) .addClass( 'uls-no-results-found-title' )
.text( 'No results found' ), .text( 'No results found' ),
$( '<div>' ) $( '<div>' )
.attr( 'id', 'uls-no-found-more' )
.addClass( 'uls-no-found-more' ) .addClass( 'uls-no-found-more' )
.append( .append(
$( '<div>' ) $( '<div>' )
@@ -54,7 +53,7 @@
this.renderTimeout = null; this.renderTimeout = null;
this.cachedQuicklist = null; this.cachedQuicklist = null;
this.$element.append( $( noResultsTemplate ) ); this.$element.append( noResultsTemplate.clone() );
this.$noResults = this.$element.children( '.uls-no-results-view' ); this.$noResults = this.$element.children( '.uls-no-results-view' );
this.render(); this.render();
@@ -175,7 +174,7 @@
lcd = this; lcd = this;
this.$noResults.addClass( 'hide' ); this.$noResults.addClass( 'hide' );
this.$element.find( '.uls-lcd-region-section' ).each( function () { this.$element.children( '.uls-lcd-region-section' ).each( function () {
var $region = $( this ), var $region = $( this ),
regionCode = $region.attr( 'id' ); regionCode = $region.attr( 'id' );
@@ -367,16 +366,20 @@
noResults: function () { noResults: function () {
this.$noResults.removeClass( 'hide' ); this.$noResults.removeClass( 'hide' );
this.$noResults.siblings( '.uls-lcd-region-section' ).addClass( 'hide' );
// Only build the data once
if ( this.$noResults.find( '.uls-lcd-region-title' ).length ) { if ( this.$noResults.find( '.uls-lcd-region-title' ).length ) {
return; return;
} }
var $suggestions = this.buildQuicklist().clone(); var $suggestions = this.buildQuicklist().clone();
$suggestions.removeClass( 'hide' ).removeAttr( 'id' );
$suggestions.find( 'h3' ) $suggestions.find( 'h3' )
.data( 'i18n', 'uls-no-results-suggestion-title' ) .data( 'i18n', 'uls-no-results-suggestion-title' )
.text( 'You may be interested in:' ) .text( 'You may be interested in:' )
.i18n(); .i18n();
this.$noResults.find( 'h2' ).after( $suggestions.show() ); this.$noResults.find( 'h2' ).after( $suggestions );
}, },
listen: function () { listen: function () {