From dd0690a861624a13a46f8095f65a2884c59204c7 Mon Sep 17 00:00:00 2001
From: Aubrey Keus <aubrey@brave.com>
Date: Fri, 16 Sep 2016 09:47:52 -0400
Subject: [PATCH] Use language name for sort order instead of identifier. Fix a
 few outdated comments.

Issue: #3955

Auditors: @bbondy, @alexwykoff

Test Plan:

  i. Open about:preferences
  ii. Ensure language are in alphabetical order in select
---
 app/locale.js | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/locale.js b/app/locale.js
index 913a18ed5c9..159777ee396 100644
--- a/app/locale.js
+++ b/app/locale.js
@@ -220,8 +220,7 @@ exports.translation = function (token) {
   if (translations[token]) {
     return translations[token]
   } else {
-    // This will return an identifier in upper case enclosed in square brackets
-    // Useful for determining if a translation was not requested in the menu
+    // This will return an identifier in upper case useful for determining if a translation was not requested in the menu
     // identifiers above.
     return token.toUpperCase()
   }
@@ -231,33 +230,33 @@ exports.translation = function (token) {
 const DEFAULT_LANGUAGE = 'en-US'
 
 const availableLanguages = [
+  'eu',
   'bn-BD',
   'bn-IN',
+  'zh-CN',
   'cs',
-  'de-DE',
+  'nl-NL',
   'en-US',
-  'es',
-  'eu',
   'fr-FR',
+  'de-DE',
   'hi-IN',
   'id-ID',
   'it-IT',
   'ja-JP',
   'ko-KR',
   'ms-MY',
-  'nl-NL',
   'pl-PL',
   'pt-BR',
   'ru',
   'sl',
+  'es',
   'ta',
   'te',
   'tr-TR',
-  'uk',
-  'zh-CN'
+  'uk'
 ]
 
-// Currently configured languages - TODO (make this dynamic)
+// Currently configured languages
 const configuredLanguages = {}
 availableLanguages.forEach(function (lang) {
   configuredLanguages[lang] = true
@@ -284,9 +283,7 @@ const defaultLocale = function () {
   }
 }
 
-// Initialize translations for a language providing an optional
-// callback executed after the translation caching process
-// is complete.
+// Initialize translations for a language
 exports.init = function (language) {
   // If this is in the main process
   if (ipcMain) {
@@ -309,7 +306,7 @@ exports.init = function (language) {
   // Currently selected language identifier I.e. 'en-US'
   lang = language || defaultLocale()
 
-  // Languages to support - TODO retrieve this dynamically
+  // Languages to support
   const langs = availableLanguages.map(function (lang) {
     return { code: lang }
   })