jenkins-bot has submitted this change and it was merged. Change subject: Update jquery.uls from upstream ......................................................................
Update jquery.uls from upstream Change-Id: I2591f5f8e761f08ef07085f3a73001ec3f84ae36 --- A lib/jquery.uls/i18n/ce.json M lib/jquery.uls/i18n/ckb.json M lib/jquery.uls/i18n/hi.json M lib/jquery.uls/i18n/ky.json M lib/jquery.uls/i18n/mzn.json A lib/jquery.uls/i18n/nds-nl.json M lib/jquery.uls/src/jquery.uls.core.js M lib/jquery.uls/src/jquery.uls.languagefilter.js 8 files changed, 59 insertions(+), 21 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/jquery.uls/i18n/ce.json b/lib/jquery.uls/i18n/ce.json new file mode 100644 index 0000000..10ef4cc --- /dev/null +++ b/lib/jquery.uls/i18n/ce.json @@ -0,0 +1,13 @@ +{ + "@metadata": { + "authors": [ + "\u0423\u043c\u0430\u0440" + ] + }, + "uls-region-WW": "\u0414\u0435\u0440\u0440\u0438\u0433\u0434\u0443\u044c\u043d\u0435\u043d\u0430\u043d", + "uls-region-AS": "\u0410\u0437\u0438", + "uls-region-ME": "\u0413\u0435\u0440\u0433\u0430\u0440\u0430 \u041c\u0430\u043b\u0445\u0431\u0430\u043b\u0435", + "uls-region-PA": "\u041e\u043a\u0435\u0430\u043d\u0438", + "uls-common-languages": "\u0428\u0430 \u0434\u04c0\u0430\u043d\u0438\u0441\u0431\u0435\u043b\u043b\u0430 \u043c\u0435\u0442\u0442\u0430\u043d\u0430\u0448", + "uls-search-placeholder": "\u041b\u0430\u0445\u0430 \u043c\u043e\u0442\u0442" +} \ No newline at end of file diff --git a/lib/jquery.uls/i18n/ckb.json b/lib/jquery.uls/i18n/ckb.json index edb7bd6..05cf204 100644 --- a/lib/jquery.uls/i18n/ckb.json +++ b/lib/jquery.uls/i18n/ckb.json @@ -12,7 +12,7 @@ "uls-region-EU": "\u0626\u06d5\u0648\u0631\u0648\u0648\u067e\u0627", "uls-region-AS": "\u0626\u0627\u0633\u06cc\u0627", "uls-region-ME": "\u0695\u06c6\u0698\u06be\u06d5\u06b5\u0627\u062a\u06cc \u0646\u0627\u0648\u06cc\u0646", - "uls-region-PA": "\u0626\u06c6\u0642\u06cc\u0627\u0646\u0648\u0648\u0633\u06cc \u067e\u0627\u0633\u06cc\u0641\u06cc\u06a9", + "uls-region-PA": "\u0626\u06c6\u0642\u06cc\u0627\u0646\u0648\u0648\u0633\u06cc \u0626\u0627\u0631\u0627\u0645", "uls-no-results-found": "\u06be\u06cc\u0686 \u0626\u0627\u06a9\u0627\u0645\u06ce\u06a9 \u0646\u06d5\u062f\u06c6\u0632\u0631\u0627\u06cc\u06d5\u0648\u06d5", "uls-common-languages": "\u0632\u0645\u0627\u0646\u06d5 \u06be\u0627\u0648\u0628\u06d5\u0634\u06d5\u06a9\u0627\u0646", "uls-no-results-suggestion-title": "\u0695\u06d5\u0646\u06af\u06d5 \u062e\u06c6\u0634\u06cc\u062a \u0628\u06ce \u0644\u06d5:", diff --git a/lib/jquery.uls/i18n/hi.json b/lib/jquery.uls/i18n/hi.json index 1b8acdc..9d49d61 100644 --- a/lib/jquery.uls/i18n/hi.json +++ b/lib/jquery.uls/i18n/hi.json @@ -1,10 +1,13 @@ { "@metadata": { "authors": [ - "Santhosh.thottingal" + "Santhosh.thottingal", + "Siddhartha Ghai" ] }, "uls-select-language": "\u092d\u093e\u0937\u093e \u091a\u0941\u0928\u0947\u0902", + "uls-region-WW": "\u0935\u0948\u0936\u094d\u0935\u093f\u0915", + "uls-region-SP": "\u0935\u093f\u0936\u0947\u0937", "uls-region-AM": "\u0905\u092e\u0947\u0930\u093f\u0915\u093e", "uls-region-AF": "\u0905\u092b\u093c\u094d\u0930\u0940\u0915\u093e", "uls-region-EU": "\u092f\u0942\u0930\u094b\u092a", @@ -12,5 +15,8 @@ "uls-region-ME": "\u092e\u0927\u094d\u092f \u092a\u0942\u0930\u094d\u0935", "uls-region-PA": "\u092a\u094d\u0930\u0936\u093e\u0902\u0924", "uls-no-results-found": "\u0915\u094b\u0908 \u092a\u0930\u093f\u0923\u093e\u092e \u0928\u0939\u0940\u0902 \u092e\u093f\u0932\u0947", - "uls-common-languages": "\u0906\u092e \u092d\u093e\u0937\u093e" + "uls-common-languages": "\u0906\u092e \u092d\u093e\u0937\u093e\u090f\u0901", + "uls-no-results-suggestion-title": "\u0906\u092a\u0915\u0947 \u0932\u093f\u092f\u0947 \u0938\u0902\u092d\u0935\u0924\u0903 \u0909\u092a\u092f\u094b\u0917\u0940:", + "uls-search-help": "\u0906\u092a \u092d\u093e\u0937\u093e \u0915\u0947 \u0928\u093e\u092e, \u0932\u093f\u092a\u093f \u0915\u0947 \u0928\u093e\u092e \u090f\u0935\u0902 \u092d\u093e\u0937\u093e \u0915\u0947 ISO \u0915\u094b\u0921 \u0938\u0947 \u0916\u094b\u091c \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948\u0902, \u0914\u0930 \u0915\u094d\u0937\u0947\u0924\u094d\u0930 \u0905\u0928\u0941\u0938\u093e\u0930 \u092c\u094d\u0930\u093e\u0909\u091c\u093c \u092d\u0940 \u0915\u0930 \u0938\u0915\u0924\u0947 \u0939\u0948\u0902:", + "uls-search-placeholder": "\u092d\u093e\u0937\u093e \u0916\u094b\u091c" } \ No newline at end of file diff --git a/lib/jquery.uls/i18n/ky.json b/lib/jquery.uls/i18n/ky.json index 72e555b..c6b9a6f 100644 --- a/lib/jquery.uls/i18n/ky.json +++ b/lib/jquery.uls/i18n/ky.json @@ -1,11 +1,13 @@ { "@metadata": { "authors": [ - "Growingup" + "Growingup", + "\u0412\u0438\u043a\u0438\u043d\u0435\u0439" ] }, "uls-select-language": "\u0422\u0438\u043b\u0434\u0438 \u0442\u0430\u043d\u0434\u043e\u043e", "uls-region-WW": "\u0411\u04af\u0442\u043a\u04af\u043b \u0434\u04af\u0439\u043d\u04e9\u043b\u04af\u043a", + "uls-region-SP": "\u0410\u0442\u0430\u0439\u044b\u043d", "uls-region-AM": "\u0410\u043c\u0435\u0440\u0438\u043a\u0430", "uls-region-AF": "\u0410\u0444\u0440\u0438\u043a\u0430", "uls-region-EU": "\u0415\u0432\u0440\u043e\u043f\u0430", @@ -13,5 +15,6 @@ "uls-region-ME": "\u0416\u0430\u043a\u044b\u043d\u043a\u044b \u0427\u044b\u0433\u044b\u0448", "uls-region-PA": "\u041e\u043a\u0435\u0430\u043d\u0438\u044f", "uls-no-results-found": "\u0416\u044b\u0439\u044b\u043d\u0442\u044b\u043a\u0442\u0430\u0440 \u0442\u0430\u0431\u044b\u043b\u0433\u0430\u043d \u0436\u043e\u043a", + "uls-no-results-suggestion-title": "\u0411\u0430\u043b\u043a\u0438\u043c \u0431\u0443\u043b \u0442\u0438\u043b\u0434\u0435\u0440 \u0441\u0438\u0437\u0434\u0438 \u043a\u044b\u0437\u044b\u043a\u0442\u044b\u0440\u0430\u0442:", "uls-search-placeholder": "\u0418\u0437\u0434\u04e9\u04e9 \u0442\u0438\u043b\u0438" } \ No newline at end of file diff --git a/lib/jquery.uls/i18n/mzn.json b/lib/jquery.uls/i18n/mzn.json index f374fc0..5fc4c70 100644 --- a/lib/jquery.uls/i18n/mzn.json +++ b/lib/jquery.uls/i18n/mzn.json @@ -6,6 +6,7 @@ }, "uls-select-language": "\u0632\u0648\u0648\u0646 \u0631\u0647 \u0627\u0646\u062a\u062e\u0627\u0628 \u0647\u0627\u06a9\u0631\u062f\u0646", "uls-region-WW": "\u062c\u0647\u0648\u0646 \u0645\u06cc\u0648\u0646", + "uls-region-SP": "\u0648\u06cc\u0698\u0647", "uls-region-AM": "\u0622\u0645\u0631\u06cc\u06a9\u0627", "uls-region-AF": "\u0622\u0641\u0631\u06cc\u0642\u0627", "uls-region-EU": "\u0627\u0631\u0648\u067e\u0627", diff --git a/lib/jquery.uls/i18n/nds-nl.json b/lib/jquery.uls/i18n/nds-nl.json new file mode 100644 index 0000000..ab9ddf8 --- /dev/null +++ b/lib/jquery.uls/i18n/nds-nl.json @@ -0,0 +1,21 @@ +{ + "@metadata": { + "authors": [ + "Servien" + ] + }, + "uls-select-language": "Taal kiezen", + "uls-region-WW": "Wereldwied", + "uls-region-SP": "Spesiaal", + "uls-region-AM": "Amerika", + "uls-region-AF": "Afrika", + "uls-region-EU": "Europa", + "uls-region-AS": "Azi\u00eb", + "uls-region-ME": "Midden-Oosten", + "uls-region-PA": "Stille Zeegebied", + "uls-no-results-found": "Gien resultaoten evunnen", + "uls-common-languages": "Taalsuggesties", + "uls-no-results-suggestion-title": "Misschien wi'j een van de volgende talen kiezen:", + "uls-search-help": "Je kunnen zeuken op taalnaam, schriftnaam, ISO-kode van de taal of je kunnen per regio deurblaojen:", + "uls-search-placeholder": "Taal zeuken" +} \ No newline at end of file diff --git a/lib/jquery.uls/src/jquery.uls.core.js b/lib/jquery.uls/src/jquery.uls.core.js index 244dd77..dad6232 100644 --- a/lib/jquery.uls/src/jquery.uls.core.js +++ b/lib/jquery.uls/src/jquery.uls.core.js @@ -224,6 +224,7 @@ * Callback for no results found context. */ noresults: function () { + $( '.regionselector' ).removeClass( 'active' ); this.$resultsView.lcd( 'noResults' ); }, @@ -231,6 +232,7 @@ * callback for results found context. */ success: function () { + $( '.regionselector' ).removeClass( 'active' ); this.$resultsView.show(); }, @@ -244,7 +246,9 @@ // Register all event listeners to the ULS here. uls.$element.on( 'click', $.proxy( uls.click, uls ) ); - uls.$languageFilter.on( 'searchclear', $.proxy( uls.defaultSearch, uls ) ); + uls.$languageFilter.on( 'searchclear.uls', $.proxy( uls.defaultSearch, uls ) ); + uls.$languageFilter.on( 'noresults.uls', $.proxy( uls.noresults, uls ) ); + uls.$languageFilter.on( 'resultsfound.uls', $.proxy( uls.success, uls ) ); // Close when clicking on the close button uls.$menu.find( '#uls-close' ).on( 'click', $.proxy( uls.cancel, uls ) ); @@ -272,14 +276,6 @@ uls.$languageFilter.languagefilter( { $target: lcd, languages: uls.languages, - success: function () { - $( '.regionselector' ).removeClass( 'active' ); - uls.success(); - }, - noresults: function () { - $( '.regionselector' ).removeClass( 'active' ); - uls.noresults(); - }, searchAPI: uls.options.searchAPI, onSelect: $.proxy( uls.select, uls ) } ); diff --git a/lib/jquery.uls/src/jquery.uls.languagefilter.js b/lib/jquery.uls/src/jquery.uls.languagefilter.js index e41e8ed..c2dc959 100644 --- a/lib/jquery.uls/src/jquery.uls.languagefilter.js +++ b/lib/jquery.uls/src/jquery.uls.languagefilter.js @@ -143,7 +143,7 @@ */ clear: function() { this.deactivate(); - this.$element.trigger( 'searchclear' ); + this.$element.trigger( 'searchclear.uls' ); }, /** @@ -222,15 +222,15 @@ /** * Handler method to be called once search is over. - * Based on search result call success or noresults callbacks + * Based on search result triggers resultsfound or noresults events * @param query string */ resultHandler: function( query ) { - if ( this.resultCount === 0 && this.options.noresults ) { + if ( this.resultCount === 0 ) { this.$suggestion.val( '' ); - this.options.noresults.call( this, query ); - } else if ( this.options.success ) { - this.options.success( this, query, this.resultCount ); + this.$element.trigger( 'noresults.uls', query ); + } else { + this.$element.trigger( 'resultsfound.uls', [query, this.resultCount] ); } }, @@ -339,8 +339,6 @@ $target: null, // Where to append the results searchAPI: null, languages: null, // Languages as code:name format. - noresults: null, // callback for no results found case - success: null, // callback if any results found. onSelect: null // Language select handler - like enter in filter textbox. }; -- To view, visit https://gerrit.wikimedia.org/r/79757 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2591f5f8e761f08ef07085f3a73001ec3f84ae36 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Amire80 <amir.ahar...@mail.huji.ac.il> Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits