fix: upgrade frontend-i18n library

.babelrc

@@ -19,7 +19,7 @@
     "i18n": {
       "plugins": [
         ["react-intl", {
-          "messagesDir": "./temp",
+          "messagesDir": "./temp/babel-plugin-react-intl",
           "moduleSourceName": "@edx/frontend-i18n"
         }]
       ]

.gitignore

@@ -6,3 +6,4 @@ temp
 .idea/
 
 src/i18n/transifex_input.json
+temp/babel-plugin-react-intl

Makefile

@@ -1,41 +1,46 @@
+transifex_resource = frontend-component-footer
+transifex_langs = "ar,fr,es_419,zh_CN"
+transifex_utils = ./node_modules/.bin/transifex-utils.js
+transifex_input = ./src/i18n/transifex_input.json
+tx_url1 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/translation/en/strings/
+tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/source/
+
+# this directory must match .babelrc
+transifex_temp = ./temp/babel-plugin-react-intl
+
 requirements:
 	npm install
 
 i18n.extract:
-    # Pulling display strings from .jsx files into .json files...
+	# Pulling display strings from .jsx files into .json files...
+	rm -rf $(transifex_temp)
 	npm run-script i18n_extract
 
 i18n.concat:
-    # Gathering JSON messages into one file...
-	./src/i18n/i18n-concat.js ./temp/src ./src/i18n/transifex_input.json
-
-
-# The following make targets are required by our tooling scripts found in:
-# - https://github.com/edx/ecommerce-scripts/tree/master/transifex
+	# Gathering JSON messages into one file...
+	$(transifex_utils) $(transifex_temp) $(transifex_input)
 
 extract_translations: | requirements i18n.extract i18n.concat
 
 detect_changed_source_translations:
-	git diff --exit-code ./src/i18n/transifex_input.json
-
-tx_url1 = https://www.transifex.com/api/2/project/edx-platform/resource/frontend-component-footer/translation/en/strings/
-tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/frontend-component-footer/source/
-
-# push translations to Transifex, doing magic so we can include the translator comments
-# Note: extract_translations is a prereq that our translation script calls separately.
-push_translations:
-	tx push -s
-	# Adding translator comments...
-	# Fetching strings from Transifex...
-	./node_modules/reactifex/bash_scripts/get_hashed_strings.sh $(tx_url1)
-    # Writing out comments to file...
-	./src/i18n/i18n-concat.js ./temp/src --comments
-    # Adding comments to Transifex...
-	./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)
-
-# pull translations from Transifex
-pull_translations: ## must be exactly this name for edx tooling support, see ecommerce-scripts/transifex/pull.py
-	tx pull -f --mode reviewed --language="ar,fr,es_419,zh_CN"
+	# Checking for changed translations...
+	git diff --exit-code $(transifex_input)
 
 validate-no-uncommitted-package-lock-changes:
+	# Checking for package-lock.json changes...
 	git diff --exit-code package-lock.json
+
+# Push translations to Transifex.  Run make extract_translations first.
+push_translations:
+	# Pushing strings to Transifex...
+	tx push -s
+	# Fetching hashes from Transifex...
+	./node_modules/reactifex/bash_scripts/get_hashed_strings.sh $(tx_url1)
+	# Writing out comments to file...
+	$(transifex_utils) $(transifex_temp) --comments
+	# Pushing comments to Transifex...
+	./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)
+
+# Pull translations from Transifex
+pull_translations:
+	tx pull -f --mode reviewed --language=$(transifex_langs)

package.json

@@ -41,7 +41,7 @@
     "@commitlint/prompt": "^6.0.2",
     "@commitlint/prompt-cli": "^6.0.2",
     "@edx/edx-bootstrap": "^2.2.1",
-    "@edx/frontend-i18n": "^1.0.4",
+    "@edx/frontend-i18n": "^2.1.0",
     "@edx/frontend-logging": "^2.0.2",
     "@edx/paragon": "^4.2.4",
     "@fortawesome/fontawesome-svg-core": "^1.2.17",
@@ -94,7 +94,7 @@
     "query-string": "^5.1.1"
   },
   "peerDependencies": {
-    "@edx/frontend-i18n": "^1.0.4",
+    "@edx/frontend-i18n": "^2.1.0",
     "@edx/frontend-logging": "^2.0.2",
     "@edx/paragon": "^4.2.4",
     "prop-types": "^15.5.10",

src/i18n/index.js

@@ -0,0 +1,32 @@
+import arMessages from './messages/ar.json';
+import caMessages from './messages/ca.json';
+// no need to import en messages-- they are in the defaultMessage field
+import es419Messages from './messages/es_419.json';
+import frMessages from './messages/fr.json';
+import zhcnMessages from './messages/zh_CN.json';
+import heMessages from './messages/he.json';
+import idMessages from './messages/id.json';
+import kokrMessages from './messages/ko_kr.json';
+import plMessages from './messages/pl.json';
+import ptbrMessages from './messages/pt_br.json';
+import ruMessages from './messages/ru.json';
+import thMessages from './messages/th.json';
+import ukMessages from './messages/uk.json';
+
+const messages = {
+  ar: arMessages,
+  'es-419': es419Messages,
+  fr: frMessages,
+  'zh-cn': zhcnMessages,
+  ca: caMessages,
+  he: heMessages,
+  id: idMessages,
+  'ko-kr': kokrMessages,
+  pl: plMessages,
+  'pt-br': ptbrMessages,
+  ru: ruMessages,
+  th: thMessages,
+  uk: ukMessages,
+};
+
+export default messages;

src/i18n/messages/ca.json

@@ -0,0 +1 @@
+{}

src/i18n/messages/he.json

@@ -0,0 +1 @@
+{}

src/i18n/messages/id.json

@@ -0,0 +1 @@
+{}

src/i18n/messages/ko_kr.json

@@ -0,0 +1 @@
+{}

src/i18n/messages/pl.json

@@ -0,0 +1 @@
+{}

src/i18n/messages/pt_br.json

@@ -0,0 +1 @@
+{}

src/i18n/messages/ru.json

@@ -0,0 +1 @@
+{}

src/i18n/messages/th.json

@@ -0,0 +1 @@
+{}

src/i18n/messages/uk.json

@@ -0,0 +1 @@
+{}