Use two-characater ISO codes for content language

slidewiki · Jun 25, 2018 · 1843f78 · 1843f78
1 parent 0fcdf22
commit 1843f78
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 38 deletions.
diff --git a/common.js b/common.js
@@ -174,4 +174,17 @@ export default {
         return a.substring(0,2).toLowerCase() === b.substring(0,2).toLowerCase();
     },
 
+    translationLanguages: [
+        'de',
+        'el',
+        'en',
+        'es',
+        'fr',
+        'it',
+        'lt',
+        'nl',
+        'pt',
+        'sr',
+    ],
+
 };
diff --git a/components/AddDeck/AddDeck.js b/components/AddDeck/AddDeck.js
@@ -93,7 +93,7 @@ class AddDeck extends React.Component {
         else {
             wrongFields.title = false;
         }
-        if (language === null || language === undefined || language.length !== 5) {
+        if (language === null || language === undefined || language.length < 2) {
             wrongFields.language = true;
             everythingIsFine = false;
         }

diff --git a/components/Deck/ContentPanel/AttachSubdeck/AttachSearchForm.js b/components/Deck/ContentPanel/AttachSubdeck/AttachSearchForm.js
@@ -4,8 +4,7 @@ import { Button, Icon,   Segment, Menu,Label,Input, Header,Form,Dropdown} from '
 import loadSearchedDecks from '../../../../actions/attachSubdeck/loadSearchedDecks';
 import KeywordsInput from '../../../Search/AutocompleteComponents/KeywordsInput';
 import UsersInput from '../../../Search/AutocompleteComponents/UsersInput';
-import {translationLanguages} from '../../../../configs/general';
-import {getLanguageNativeName} from '../../../../common';
+import {translationLanguages, getLanguageNativeName} from '../../../../common';
 
 class AttachSearchForm extends React.Component{
     constructor(props){

diff --git a/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js b/components/Deck/ContentPanel/DeckModes/DeckEditPanel/DeckPropertiesEditor.js
@@ -200,7 +200,7 @@ class DeckPropertiesEditor extends React.Component {
             isValid = false;
         }
 
-        if (this.state.language == null || this.state.language.length !== 5) {
+        if (this.state.language == null || this.state.language.length < 2) {
             validationErrors.language = 'Please select a language.';
             isValid = false;
         }

diff --git a/components/Search/SearchPanel.js b/components/Search/SearchPanel.js
@@ -12,8 +12,7 @@ import TagsInput from './AutocompleteComponents/TagsInput';
 import KeywordsInput from './AutocompleteComponents/KeywordsInput';
 import loadMoreResults from '../../actions/search/loadMoreResults';
 import {FormattedMessage, defineMessages} from 'react-intl';
-import {translationLanguages} from '../../configs/general';
-import {getLanguageNativeName} from '../../common';
+import {translationLanguages, getLanguageNativeName} from '../../common';
 
 let MediaQuery = require ('react-responsive');
 

diff --git a/components/common/LanguageDropdown.js b/components/common/LanguageDropdown.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 import {FormattedMessage, defineMessages} from 'react-intl';
-import {translationLanguages} from '../../configs/general';
-import {getLanguageNativeName} from '../../common';
+import {translationLanguages, getLanguageNativeName} from '../../common';
 
 /**
  * Properties:

diff --git a/configs/general.js b/configs/general.js
@@ -12,18 +12,4 @@ export default {
     publicRecaptchaKey: '6LdNLyYTAAAAAINDsVZRKG_E3l3Dvpp5sKboR1ET',
     loglevel: 'debug',
     ssoEnabled: true,
-
-    translationLanguages: [
-        'de-DE',
-        'el-GR',
-        'en-GB',
-        'es-ES',
-        'fr-FR',
-        'it-IT',
-        'lt-LT',
-        'nl-NL',
-        'pt-PT',
-        'sr-RS',
-    ],
-
 };
diff --git a/general.js.template b/general.js.template
@@ -8,18 +8,4 @@ export default {
     publicRecaptchaKey: '${SERVICE_USER_PUBLIC_RECAPTCHA_KEY}',
     loglevel: '${LOGGING_LEVEL}',
     ssoEnabled: ${SSO_ENABLED},
-
-    translationLanguages: [
-        'de-DE',
-        'el-GR',
-        'en-GB',
-        'es-ES',
-        'fr-FR',
-        'it-IT',
-        'lt-LT',
-        'nl-NL',
-        'pt-PT',
-        'sr-RS',
-    ],
-
 };
diff --git a/stores/TranslationStore.js b/stores/TranslationStore.js
@@ -1,6 +1,5 @@
 import {BaseStore} from 'fluxible/addons';
-import {translationLanguages} from '../configs/general';
-import {compareLanguageCodes} from '../common';
+import {translationLanguages, compareLanguageCodes} from '../common';
 
 class TranslationStore extends BaseStore {
     constructor(dispatcher) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -174,4 +174,17 @@ export default { @@
             return a.substring(0,2).toLowerCase() === b.substring(0,2).toLowerCase();
         },
+        translationLanguages: [
+            'de',
+            'el',
+            'en',
+            'es',
+            'fr',
+            'it',
+            'lt',
+            'nl',
+            'pt',
+            'sr',
+        ],
     };