Dropdown Alignment for locale names - Fix #19, #127 #159
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| var locale, pageLocales = {}; | ||
| // eslint-disable-next-line | ||
| var languages = {'af': 'Afrikaans', 'id': 'Bahasa Indonesia', 'cy': 'Cymraeg', 'de': 'Deutsch', 'en': 'English', 'ga': 'Gaeilge', 'gv': 'Gaelg', 'gd': 'Gàidhlig', 'rn': 'Ikirundi', 'sw': 'Kiswahili', 'lg': 'Luganda', 'mt': 'Malti', 'nl': 'Nederlands', 'sq': 'Shqip', 'vi': 'Tiếng Việt', 'tr': 'Türkçe', 'az': 'azərbaycan', 'br': 'brezhoneg', 'ca': 'català', 'da': 'dansk', 'se': 'davvisámegiella', 'et': 'eesti', 'es': 'español', 'eo': 'esperanto', 'eu': 'euskara', 'fr': 'français', 'fo': 'føroyskt', 'ia': 'interlingua', 'xh': 'isiXhosa', 'zu': 'isiZulu', 'it': 'italiano', 'mfe': 'kreol morisien', 'lv': 'latviešu', 'lt': 'lietuvių', 'hu': 'magyar', 'nb': 'norsk bokmål', 'nn': 'nynorsk', 'uz': 'oʻzbekcha', 'pl': 'polski', 'pt': 'português', 'ro': 'română', 'rm': 'rumantsch', 'sk': 'slovenčina', 'sl': 'slovenščina', 'fi': 'suomi', 'sv': 'svenska', 'is': 'íslenska', 'cs': 'čeština', 'el': 'Ελληνικά', 'tg': 'Тоҷикӣ', 'ba': 'башҡортса', 'be': 'беларуская', 'bg': 'български', 'os': 'ирон', 'kum': 'къумукъча', 'ky': 'кыргызча', 'mk': 'македонски', 'ru': 'русский', 'tt': 'татарча', 'uk': 'українська', 'kk': 'қазақша', 'hy': 'հայերեն', 'he': 'עברית', 'ur': 'اردو', 'ar': 'العربية', 'fa': 'فارسی', 'ne': 'नेपाली', 'mr': 'मराठी', 'hi': 'हिंदी', 'as': 'অসমীয়া', 'bn': 'বাংলা', 'pa': 'ਪੰਜਾਬੀ', 'te': 'తెలుగు', 'ml': 'മലയാളം', 'si': 'සිංහල', 'th': 'ไทย', 'lo': 'ລາວ', 'zh': '中文', 'ko': '한국어', 'mrj': 'Мары йӹлмӹ', 'gl': 'galego', 'myv': 'Эрзянь кель', 'oc': 'occitan', 'cv': 'чӑвашла', 'arg': 'aragonés', 'ast': 'asturianu', 'msa': 'bahasa malay', 'hbs': 'srpskohrvatski', 'srp': 'српски', 'hrv': 'hrvatski', 'bos': 'bosanski', 'nog': 'ногъайша', 'sah': 'сахалыы', 'uig': 'ئۇيغۇرچە', 'tyv': 'тыва дылда'}; | ||
| // eslint-disable-next-line | ||
|
|
@@ -76,16 +76,29 @@ $(document).ready(function () { | |
| console.warn('No config.LOCALES'); | ||
| } | ||
| $('.localeSelect').val(locale); | ||
| $('#localeName').text(pageLocales[locale]); | ||
| localizeEverything(localizedHTML); | ||
| persistChoices('localization'); | ||
| }); | ||
|
|
||
| $('.localeSelect').change(function () { | ||
| locale = $(this).val(); | ||
| $('#localeName').text(pageLocales[locale]); | ||
| localizeCurrentInterface(); | ||
| }); | ||
|
|
||
| $('#localeDropdown li > a').click(function () { | ||
| locale = this.rel; | ||
| $('.localeSelect').val(locale); | ||
| $('#localeName').text(this.text); | ||
| localizeCurrentInterface(); | ||
| }); | ||
|
|
||
| function localizeCurrentInterface() { | ||
| sendEvent('localization', 'localize', locale); | ||
| localizeEverything(false); | ||
| persistChoices('localization'); | ||
| } | ||
|
|
||
| function localizeEverything(stringsFresh) { | ||
| localizeInterface(); | ||
|
|
@@ -114,6 +127,7 @@ $(document).ready(function () { | |
| window.location.hash; | ||
| window.history.replaceState({}, document.title, newURL); | ||
| } | ||
| $('#localeDropdownCaret').css('left', rtlLanguages.indexOf(locale) !== -1 ? '5%' : '90%'); | ||
| } | ||
| }); | ||
|
|
||
|
|
@@ -169,7 +183,6 @@ function getLocale() { | |
| deferred.resolve(); | ||
| } | ||
| } | ||
| return deferred.promise(); | ||
| } | ||
|
|
||
|
|
@@ -207,18 +220,42 @@ function getLocales() { | |
| var localePairs = []; | ||
| for(var code in locales) { | ||
| localePairs.push([code, locales[code]]); | ||
| pageLocales[code] = locales[code]; | ||
| } | ||
| localePairs = localePairs.sort(function (a, b) { | ||
| return a[1].toLowerCase().localeCompare(b[1].toLowerCase()); | ||
| }); | ||
| $('.localeSelect').empty(); | ||
| $('#localeDropdown').empty(); | ||
| $.each(localePairs, function () { | ||
| $('.localeSelect').append( | ||
| $('<option></option>') | ||
|
||
| .val(this[0]) | ||
| .text(this[1]) | ||
| .prop('dir', rtlLanguages.indexOf(this[0]) !== -1 ? 'rtl' : 'ltr') | ||
| ); | ||
|
|
||
| $('#localeDropdown').append( | ||
| $('<li></li>').append( | ||
| $('<a>', { | ||
| rel: this[0] // eslint-disable-line id-length | ||
|
||
| }) | ||
|
||
| .text(this[1]) | ||
| .prop('dir', rtlLanguages.indexOf(this[0]) !== -1 ? 'rtl' : 'ltr') | ||
|
||
| .css('padding-left', rtlLanguages.indexOf(this[0]) !== -1 ? '105px' : '5px') | ||
| .css('padding-right', rtlLanguages.indexOf(this[0]) !== -1 ? '5px' : '105px') | ||
|
||
| .hover( | ||
|
||
| function () { | ||
| $(this).css('background-color', '#446e9b'); | ||
| $(this).css('color', '#FFF'); | ||
| }, | ||
| function () { | ||
| $(this).css('background-color', '#FFF'); | ||
| $(this).css('color', '#000'); | ||
| } | ||
| ) | ||
| ) | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is
pageLocales? Sorry, completely missed this earlier.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Um,
pageLocalesis an object storinglocale: corresponding languageaskey: valuepairs. I populate this object through AJAX call fromlocales.json. This was required because, forselect, it was simple to just set thevaltolocaleas the associated value held was the corresponding language. However, for the bootstrap button, to set its text, I fetch the locale and then set its text through this object. One more approach I had was to run a loop and fetch the language name fromlocales[], but I chose this as it looked more cleaner and not much cluttering.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It sounds like this data could also be stored inside the locale dropdown's items below at L242. I'm also not sure why this is called
pageLocales.