fixup! fixup! fixup! DONOTMERGE!!!!! Revert "Allow changing language from dropdown, only build base, create script for html-translations."

This reverts commit b115ab0.

Author: jotoeri

lib/build-challenges.js

@@ -14,7 +14,7 @@ var layout = fs.readFileSync(path.normalize(path.join(__dirname, '../resources/l
 var files = []
 
 // Take in a language type if any
-var langs = ['en-US'] // TODO Adapt - Only short Term fix here
+var langs = locale.getAvaiableLocales()
 var input = ''
 var output = ''
 

lib/build-pages.js

@@ -8,8 +8,7 @@ var path = require('path')
 var locale = require('./locale.js')
 var Handlebars = require('handlebars')
 
-// TODO Adapt - Only short Term fix here
-var langs = ['en-US']
+var langs = locale.getAvaiableLocales()
 
 var layout = fs.readFileSync(path.normalize(path.join(__dirname, '..', 'resources', 'layouts', 'page.hbs'))).toString()
 var input = ''

lib/i18n-translate.js

@@ -0,0 +1,17 @@
+//
+// Touches the DOM.
+// This file listens to events from the language selector and changes the
+// DOM to have the language requested.
+// Uses globals from chal-header.html.
+//
+
+// Selecting the current locale
+var selector = document.getElementById('lang-select')
+
+// add change listener
+selector.addEventListener('change', function (event) {
+  // Go to page in the locale specified
+  var location = window.location
+  var url = location.href.replace(/built\/([a-z]{2}-[A-Z]{2})/, 'built/' + selector.value)
+  location.href = url
+})

lib/languages.js

@@ -1,5 +1,4 @@
 var path = require('path')
-const { appLanguages } = require('../config/i18next.config')
 
 /**
  * available
@@ -8,7 +7,15 @@ const { appLanguages } = require('../config/i18next.config')
  * @type {string[]}
  */
 var available = {
-  'en-US': 'English'
+  'en-US': 'English',
+  'ja-JP': '日本語',
+  'zh-TW': '中文(臺灣)',
+  'ko-KR': '한국어',
+  'pt-BR': 'Português Brasileiro',
+  'uk-UA': 'Українська',
+  'es-CO': 'Español (Colombia)',
+  'es-ES': 'Español (España)',
+  'fr-FR': 'Français'
 }
 
 /**
@@ -17,7 +24,14 @@ var available = {
  * @type {string[]}
  */
 var aliases = {
-  en: 'en-US'
+  en: 'en-US',
+  ja: 'ja-JP',
+  zh: 'zh-TW',
+  kr: 'ko-KR',
+  br: 'pt-BR',
+  uk: 'uk-UA',
+  es: 'es-ES',
+  fr: 'fr-FR'
 }
 
 /**
@@ -108,6 +122,29 @@ function getLocaleResourcesPath (lang) {
   return path.join(basepath, 'resources', 'contents', getLocale(lang))
 }
 
+/**
+ * Get the locale name.
+ * @param lang
+ * @return {string}
+ */
+function getLocaleName (lang) {
+  if (isAvaliable(lang)) {
+    return available[lang]
+  } else if (isAlias(lang)) {
+    return available[getAliasLocale(lang)]
+  } else {
+    throw new Error('locale ' + lang + ' do not exist.Do you add it in lib/locale.js?')
+  }
+}
+
+/**
+ * Get the avaiable locale array.
+ * @return {Array}
+ */
+function getAvaiableLocales () {
+  return Object.keys(available)
+}
+
 /**
  * Get fallback.
  * @type {string}
@@ -121,17 +158,22 @@ function getFallbackLocale () {
  * @return {string}
  */
 function getLocaleMenu (current) {
-  let menu = ''
-  Object.entries(appLanguages).forEach(([languageKey, language]) => {
-    menu = menu.concat('<option value="' + languageKey + '">' + language + '</option>')
-  })
-
+  var menu = ''
+  for (var lang in available) {
+    if (lang === current) {
+      menu = menu.concat('<option value="' + lang + '" selected="selected">' + getLocaleName(lang) + '</option>')
+    } else {
+      menu = menu.concat('<option value="' + lang + '">' + getLocaleName(lang) + '</option>')
+    }
+  }
   return menu
 }
 
 module.exports.getLocale = getLocale
 module.exports.getLocaleBuiltPath = getLocaleBuiltPath
 module.exports.getLocaleResourcesPath = getLocaleResourcesPath
 module.exports.getCurrentLocale = getCurrentLocale
+module.exports.getLocaleName = getLocaleName
+module.exports.getAvaiableLocales = getAvaiableLocales
 module.exports.getFallbackLocale = getFallbackLocale
 module.exports.getLocaleMenu = getLocaleMenu

lib/locale.js

@@ -84,13 +84,8 @@ app.on('ready', function appReady () {
       })
     }
   })
-
-  buildMenus()
   mainWindow.loadURL('file://' + locale.getLocaleBuiltPath(language) + '/pages/index.html')
 
-  /*
-   * Create ipc listeners
-   */
   ipcMain.on('getUserDataPath', function (event) {
     event.returnValue = userDataPath
   })
@@ -118,30 +113,18 @@ app.on('ready', function appReady () {
     event.sender.send('confirm-clear-response', resp)
   })
 
-  /*
-   * Create i18n Listener
-   */
-  global.i18n.on('languageChanged', () => {
-    buildMenus()
-  })
-
-  /*
-   * MainWindow Listener
-   */
-  mainWindow.on('closed', function winClosed () {
-    mainWindow = null
-  })
-})
-
-function buildMenus () {
   if (process.platform === 'darwin') {
     menu = Menu.buildFromTemplate(darwinTemplate(app, mainWindow, global.i18n))
     Menu.setApplicationMenu(menu)
   } else {
     menu = Menu.buildFromTemplate(otherTemplate(app, mainWindow, global.i18n))
     mainWindow.setMenu(menu)
   }
-}
+
+  mainWindow.on('closed', function winClosed () {
+    mainWindow = null
+  })
+})
 
 function setAllChallengesComplete (path) {
   var challenges = JSON.parse(fs.readFileSync(path))

main.js

@@ -8,6 +8,7 @@
         <link rel="stylesheet" href="../../../assets/css/buttons.css">
         <link rel="stylesheet" href="../../../assets/octicons.css">
         <script src="../../../lib/challenges-completed.js"></script>
+        <script src="../../../lib/handle-external-links.js"></script>
     </head>
     <body class="index-page">
         <header class="site-header">
@@ -113,7 +114,6 @@ <h1 i18n-data="index~Congratulations!"></h1>
             </div>
 
         </div>
-        <script src="../../../lib/i18n-translate.js"></script>
-        <script src="../../../lib/handle-external-links.js"></script>
+        <script src="../../../lib/languages.js"></script>
     </body>
 </html>

resources/contents/en-US/pages/index.html

@@ -9,3 +9,9 @@
     </a>
     <span class="challenge-title">{{ pageTitle }}</span>
 </header>
+
+
+<script>
+    var selector = document.getElementById('lang-select');
+    selector.value = "{{ lang }}"
+</script>

resources/contents/en-US/partials/header.html

@@ -26,8 +26,8 @@
       challengeStatus.completed(currentChallenge)
     </script>
 
-    <script>require('../../../lib/challenge.js')</script>
-    <script>require('../../../lib/i18n-translate.js')</script>
     <script>require('../../../lib/handle-external-links.js')</script>
+    <script>require('../../../lib/languages.js')</script>
+    <script>require('../../../lib/challenge.js')</script>
   </body>
 </html>

resources/layouts/challenge.hbs

@@ -6,6 +6,7 @@
     <link rel="stylesheet" href="../../../assets/css/new-style.css">
     <link rel="stylesheet" href="../../../assets/css/new-challenge.css">
     <link rel="stylesheet" href="../../../assets/css/buttons.css">
+    <script>require('../../../lib/handle-external-links.js')</script>
   </head>
 
   <body>
@@ -15,7 +16,5 @@
       {{{ body }}}
     </div>
 
-    <script src="../../../lib/i18n-translate.js"></script>
-    <script>require('../../../lib/handle-external-links.js')</script>
   </body>
 </html>