Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k

js/components/settings_container.js

@@ -104,7 +104,7 @@ let AccountSettings = React.createClass({
                 show={true}
                 defaultExpanded={true}>
                 {content}
-                <Form
+                {/*<Form
                     url={AppConstants.serverUrl + 'api/users/set_language/'}>
                     <Property
                         name='language'
@@ -121,7 +121,7 @@ let AccountSettings = React.createClass({
                         </select>
                     </Property>
                     <hr />
-                </Form>
+                </Form>*/}
             </CollapsibleParagraph>
         );
     }

js/utils/lang_utils.js

@@ -4,6 +4,14 @@ import languages from '../constants/languages';
 
 import { formatText } from './general_utils';
 
+
+export function getLang() {
+    // this is just for testing, as changing the navigator.language wasn't possible
+    // return 'fr';
+    return navigator.languages ? navigator.languages[0] :
+                                 (navigator.language || navigator.userLanguage);
+}
+
 /**
  * Is used to translate strings to another language. Basically can be used with C's string format method.
  * @param  {string}    s        The string you want to translate
@@ -11,9 +19,7 @@ import { formatText } from './general_utils';
  * @return {string}             The formated string
  */
 export function getLangText(s, ...args) {
-    let lang = navigator.language || navigator.userLanguage;
-    // this is just for testing, as changing the navigator.language wasn't possible
-    //ang = 'de';
+    let lang = getLang();
     try {
         if(lang in languages) {
             return formatText(languages[lang][s], args);