German date formats (hql287#247)

* set moment locale also on app start * added more german date formats
virtualadrian · Mar 4, 2018 · d11accd · d11accd
1 parent 439873d
commit d11accd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/app/components/settings/_partials/invoice/Other.jsx b/app/components/settings/_partials/invoice/Other.jsx
@@ -79,9 +79,18 @@ function Other({
             <option value="DD/MM/YY">
               {moment(Date.now()).format('DD/MM/YY')} (DD/MM/YY)
             </option>
+            <option value="dddd, Do MMMM YYYY">
+              {moment(Date.now()).format('dddd, Do MMMM YYYY')} (dddd, Do MMMM YYYY)
+            </option>
+            <option value="Do MMMM YYYY">
+              {moment(Date.now()).format('Do MMMM YYYY')} (Do MMMM YYYY)
+            </option>
             <option value="DD.MM.YYYY">
               {moment(Date.now()).format('DD.MM.YYYY')} (DD.MM.YYYY)
             </option>
+            <option value="DD.MM.YY">
+              {moment(Date.now()).format('DD.MM.YY')} (DD.MM.YY)
+            </option>
           </select>
         </Field>
       </Row>

diff --git a/i18n/i18n.js b/i18n/i18n.js
@@ -45,4 +45,6 @@ i18n.on('languageChanged', currentLang => {
   moment.locale(currentLang);
 });
 
+moment.locale(defaultLanguage);
+
 export default i18n;