Merge branch 'zulip:main' into pr-homescreen-icon-change-5303

zulip · Nov 8, 2022 · 4561d06 · 4561d06
2 parents f33b6b3 + c643c2a
commit 4561d06
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 692 deletions.
diff --git a/flow-typed/translations.js b/flow-typed/translations.js
@@ -80,10 +80,6 @@ declare module '../../static/translations/messages_fr.json' {
   declare export default {| [string]: string |};
 }
 
-declare module '../../static/translations/messages_fr_FR.json' {
-  declare export default {| [string]: string |};
-}
-
 declare module '../../static/translations/messages_gl.json' {
   declare export default {| [string]: string |};
 }
@@ -100,10 +96,6 @@ declare module '../../static/translations/messages_hr.json' {
   declare export default {| [string]: string |};
 }
 
-declare module '../../static/translations/messages_hr_HR.json' {
-  declare export default {| [string]: string |};
-}
-
 declare module '../../static/translations/messages_hu.json' {
   declare export default {| [string]: string |};
 }
@@ -140,10 +132,6 @@ declare module '../../static/translations/messages_my.json' {
   declare export default {| [string]: string |};
 }
 
-declare module '../../static/translations/messages_nb_NO.json' {
-  declare export default {| [string]: string |};
-}
-
 declare module '../../static/translations/messages_nl.json' {
   declare export default {| [string]: string |};
 }

diff --git a/src/i18n/messages.js b/src/i18n/messages.js
@@ -30,12 +30,10 @@ export default {
   fa: require('../../static/translations/messages_fa.json'),
   fi: require('../../static/translations/messages_fi.json'),
   fr: require('../../static/translations/messages_fr.json'),
-  'fr-FR': require('../../static/translations/messages_fr_FR.json'),
   gl: require('../../static/translations/messages_gl.json'),
   gu: require('../../static/translations/messages_gu.json'),
   hi: require('../../static/translations/messages_hi.json'),
   hr: require('../../static/translations/messages_hr.json'),
-  'hr-HR': require('../../static/translations/messages_hr_HR.json'),
   hu: require('../../static/translations/messages_hu.json'),
   id: require('../../static/translations/messages_id.json'),
   it: require('../../static/translations/messages_it.json'),

diff --git a/static/translations/messages_fr_FR.json b/static/translations/messages_fr_FR.json