Merge branch 'master' into lunyachek/feat/header-styles-inclusion-master

.gitignore

@@ -25,3 +25,5 @@ module.config.js
 ### transifex ###
 src/i18n/transifex_input.json
 temp
+
+src/i18n/messages

Makefile

@@ -2,9 +2,6 @@ npm-install-%: ## install specified % npm package
 	npm install $* --save-dev
 	git add package.json
 
-transifex_resource = frontend-app-ora-grading
-transifex_langs = "ar,de_DE,es_419,fa_IR,fr,fr_CA,hi,it_IT,pt_PT,uk,ru,zh_CN"
-
 intl_imports = ./node_modules/.bin/intl-imports.js
 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n
@@ -43,23 +40,6 @@ detect_changed_source_translations:
 	# Checking for changed translations...
 	git diff --exit-code $(i18n)
 
-# Pushes translations to Transifex.  You must run make extract_translations first.
-push_translations:
-	# Pushing strings to Transifex...
-	tx push -s
-	# Fetching hashes from Transifex...
-	./node_modules/@edx/reactifex/bash_scripts/get_hashed_strings_v3.sh
-	# Writing out comments to file...
-	$(transifex_utils) $(transifex_temp) --comments --v3-scripts-path
-	# Pushing comments to Transifex...
-	./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
-
-ifeq ($(OPENEDX_ATLAS_PULL),)
-# Pulls translations from Transifex.
-pull_translations:
-	tx pull -t -f --mode reviewed --languages=$(transifex_langs)
-else
-# Experimental: OEP-58 Pulls translations using atlas
 pull_translations:
 	rm -rf src/i18n/messages
 	mkdir src/i18n/messages
@@ -72,7 +52,6 @@ pull_translations:
 	           translations/frontend-app-ora-grading/src/i18n/messages:frontend-app-ora-grading
 
 	$(intl_imports) frontend-component-footer frontend-component-header frontend-platform paragon frontend-app-ora-grading
-endif
 
 # This target is used by CI.
 validate-no-uncommitted-package-lock-changes:

catalog-info.yaml

@@ -14,6 +14,6 @@ metadata:
       title: "Stage Site"
       icon: "Web"
 spec:
-  owner: group:content-aurora
+  owner: ~
   type: 'website'
   lifecycle: 'production'

src/i18n/index.js

@@ -1,39 +1 @@
-import { messages as footerMessages } from '@edx/frontend-component-footer';
-import { messages as headerMessages } from '@edx/frontend-component-header';
-import { messages as paragonMessages } from '@openedx/paragon';
-
-import arMessages from './messages/ar.json';
-import deDEMessages from './messages/de_DE.json';
-import es419Messages from './messages/es_419.json';
-import faIRMessages from './messages/fa_IR.json';
-import frMessages from './messages/fr.json';
-import frCAMessages from './messages/fr_CA.json';
-import hiMessages from './messages/hi.json';
-import itITMessages from './messages/it_IT.json';
-import ptPTMessages from './messages/pt_PT.json';
-import ruMessages from './messages/ru.json';
-import ukMessages from './messages/uk.json';
-import zhCNMessages from './messages/zh_CN.json';
-// no need to import en messages-- they are in the defaultMessage field
-
-const appMessages = {
-  ar: arMessages,
-  'de-de': deDEMessages,
-  'es-419': es419Messages,
-  'fa-ir': faIRMessages,
-  fr: frMessages,
-  'fr-ca': frCAMessages,
-  hi: hiMessages,
-  'it-it': itITMessages,
-  'pt-pt': ptPTMessages,
-  ru: ruMessages,
-  uk: ukMessages,
-  'zh-cn': zhCNMessages,
-};
-
-export default [
-  headerMessages,
-  footerMessages,
-  paragonMessages,
-  appMessages,
-];
+export default [];