Merge pull request #34 from edx/douglashall/reduce_bundle_size

fix: remove paragon from bundle

.gitignore

@@ -4,3 +4,5 @@ node_modules
 temp
 
 .idea/
+
+src/i18n/transifex_input.json

Makefile

@@ -1,8 +1,5 @@
-extract_translations: ## no prerequisites so we can control order of operations
-	echo "We have to define this target due to tooling assumptions"
-	echo "Also we have to npm install using this hook b/c there's no other place for it in the current setup"
+requirements:
 	npm install
-	npm run-script i18n_extract
 
 i18n.extract:
     # Pulling display strings from .jsx files into .json files...
@@ -12,6 +9,12 @@ 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
+
+extract_translations: | requirements i18n.extract i18n.concat
+
 detect_changed_source_translations:
 	git diff --exit-code ./src/i18n/transifex_input.json
 
@@ -19,7 +22,9 @@ tx_url1 = https://www.transifex.com/api/2/project/edx-platform/resource/frontend
 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
-push_translations: | i18n.extract
+# 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)

package.json

@@ -39,6 +39,7 @@
     "@commitlint/config-angular": "^6.0.2",
     "@commitlint/prompt": "^6.0.2",
     "@commitlint/prompt-cli": "^6.0.2",
+    "@edx/paragon": "^4.2.4",
     "@fortawesome/fontawesome-svg-core": "^1.2.17",
     "@fortawesome/free-brands-svg-icons": "^5.8.1",
     "@fortawesome/free-regular-svg-icons": "^5.8.1",
@@ -67,7 +68,11 @@
     "image-webpack-loader": "^4.2.0",
     "jest": "23.6.0",
     "node-sass": "^4.7.2",
+    "prop-types": "^15.5.10",
+    "react": "^16.4.2",
     "react-dev-utils": "^5.0.0",
+    "react-dom": "^16.2.0",
+    "react-intl": "2.x",
     "react-test-renderer": "^16.6.0",
     "reactifex": "^1.1.1",
     "sass-loader": "^6.0.6",
@@ -82,9 +87,11 @@
     "webpack-merge": "^4.2.1"
   },
   "dependencies": {
-    "@edx/paragon": "^3.8.0",
+    "query-string": "^5.1.1"
+  },
+  "peerDependencies": {
+    "@edx/paragon": "^4.2.4",
     "prop-types": "^15.5.10",
-    "query-string": "^6.5.0",
     "react": "^16.4.2",
     "react-dom": "^16.2.0",
     "react-intl": "2.x"

src/i18n/messages/ar.json

@@ -1,6 +1,6 @@
 {
-  "footer.site-footer.link.about": "About",
   "footer.site-footer.link.business": "{siteName} for Business",
+  "footer.site-footer.link.about": "About",
   "footer.site-footer.link.affiliates": "Affiliates",
   "footer.site-footer.link.open-source": "Open {siteName}",
   "footer.site-footer.link.careers": "Careers",

src/i18n/messages/es_419.json

@@ -1,6 +1,6 @@
 {
-  "footer.site-footer.link.about": "About",
   "footer.site-footer.link.business": "{siteName} for Business",
+  "footer.site-footer.link.about": "About",
   "footer.site-footer.link.affiliates": "Affiliates",
   "footer.site-footer.link.open-source": "Open {siteName}",
   "footer.site-footer.link.careers": "Careers",

src/i18n/messages/fr.json

@@ -1,6 +1,6 @@
 {
-  "footer.site-footer.link.about": "About",
   "footer.site-footer.link.business": "{siteName} for Business",
+  "footer.site-footer.link.about": "About",
   "footer.site-footer.link.affiliates": "Affiliates",
   "footer.site-footer.link.open-source": "Open {siteName}",
   "footer.site-footer.link.careers": "Careers",

src/i18n/messages/zh_CN.json

@@ -1,39 +1,39 @@
 {
-  "footer.site-footer.link.about": "About",
-  "footer.site-footer.link.business": "{siteName} for Business",
-  "footer.site-footer.link.affiliates": "Affiliates",
-  "footer.site-footer.link.open-source": "Open {siteName}",
-  "footer.site-footer.link.careers": "Careers",
-  "footer.site-footer.link.news": "News",
-  "footer.site-footer.link.header.legal": "Legal",
-  "footer.site-footer.link.terms-of-service": "Terms of Service & Honor Code",
-  "footer.site-footer.link.privacy": "Privacy Policy",
-  "footer.site-footer.link.accessibility": "Accessibility Policy",
-  "footer.site-footer.link.trademark": "Trademark Policy",
-  "footer.site-footer.link.sitemap": "Sitemap",
-  "footer.site-footer.link.header.connect": "Connect",
-  "footer.site-footer.link.blog": "Blog",
-  "footer.site-footer.link.contact-us": "Contact Us",
-  "footer.site-footer.link.help-center": "Help Center",
-  "footer.site-footer.link.media-kit": "Media Kit",
-  "footer.site-footer.link.donate": "Donate",
+  "footer.site-footer.link.business": "商用{siteName} ",
+  "footer.site-footer.link.about": "关于",
+  "footer.site-footer.link.affiliates": "附属机构",
+  "footer.site-footer.link.open-source": "打开{siteName}",
+  "footer.site-footer.link.careers": "招才纳贤",
+  "footer.site-footer.link.news": "新闻",
+  "footer.site-footer.link.header.legal": "法律条款",
+  "footer.site-footer.link.terms-of-service": "服务条款 & 荣誉准则",
+  "footer.site-footer.link.privacy": "隐私政策",
+  "footer.site-footer.link.accessibility": "可访问策略",
+  "footer.site-footer.link.trademark": "商标政策",
+  "footer.site-footer.link.sitemap": "网站导航",
+  "footer.site-footer.link.header.connect": "连接",
+  "footer.site-footer.link.blog": "博客",
+  "footer.site-footer.link.contact-us": "联系我们",
+  "footer.site-footer.link.help-center": "帮助中心",
+  "footer.site-footer.link.media-kit": "多媒体工具箱",
+  "footer.site-footer.link.donate": "捐献",
   "footer.site-footer.copyright-text": "{copyrightSymbol} {startDate}–{endDate} {siteName} Inc.",
   "footer.site-footer.trademark-text": "EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | {icpLicense}",
   "footer.site-footer.site-logo.alt-text": "{siteName} logo",
-  "footer.site-footer.site-logo.aria-label": "{siteName} Home",
-  "footer.site-footer.facebook.title": "Facebook",
-  "footer.site-footer.facebook.screen-reader-text": "Like {siteName} on Facebook",
-  "footer.site-footer.twitter.title": "Twitter",
-  "footer.site-footer.twitter.screen-reader-text": "Follow {siteName} on Twitter",
+  "footer.site-footer.site-logo.aria-label": "{siteName} 主页",
+  "footer.site-footer.facebook.title": "脸书",
+  "footer.site-footer.facebook.screen-reader-text": "在Facebook上为 {siteName}点赞",
+  "footer.site-footer.twitter.title": "推特",
+  "footer.site-footer.twitter.screen-reader-text": "在Twitter上关注 {siteName}",
   "footer.site-footer.youtube.title": "Youtube",
-  "footer.site-footer.youtube.screen-reader-text": "Subscribe to the {siteName} YouTube channel",
+  "footer.site-footer.youtube.screen-reader-text": "订阅{siteName} YouTube频道",
   "footer.site-footer.linkedin.title": "LinkedIn",
-  "footer.site-footer.linkedin.screen-reader-text": "Follow {siteName} on LinkedIn",
+  "footer.site-footer.linkedin.screen-reader-text": "在LinkedIn上关注{siteName}",
   "footer.site-footer.google-plus.title": "Google+",
-  "footer.site-footer.google-plus.screen-reader-text": "Follow {siteName} on Google+",
+  "footer.site-footer.google-plus.screen-reader-text": "在Google+上关注{siteName} ",
   "footer.site-footer.reddit.title": "Reddit",
-  "footer.site-footer.reddit.screen-reader-text": "Subscribe to the {siteName} subreddit",
-  "footer.site-footer.apple-app-store.alt-text": "Download the {siteName} mobile app from the Apple App Store",
-  "footer.site-footer.google-play.alt-text": "Download the {siteName} mobile app from Google Play",
-  "footer.site-footer.footer.aria-label": "Page Footer"
+  "footer.site-footer.reddit.screen-reader-text": "订阅{siteName} subreddit",
+  "footer.site-footer.apple-app-store.alt-text": "从Apple App Store下载 {siteName} 的移动客户端",
+  "footer.site-footer.google-play.alt-text": "从Google Play下载 {siteName} 的移动客户端",
+  "footer.site-footer.footer.aria-label": "页脚"
 }

src/i18n/transifex_input.json

@@ -1,39 +0,0 @@
-{
-  "footer.site-footer.link.about": "About",
-  "footer.site-footer.link.business": "{siteName} for Business",
-  "footer.site-footer.link.affiliates": "Affiliates",
-  "footer.site-footer.link.open-source": "Open {siteName}",
-  "footer.site-footer.link.careers": "Careers",
-  "footer.site-footer.link.news": "News",
-  "footer.site-footer.link.header.legal": "Legal",
-  "footer.site-footer.link.terms-of-service": "Terms of Service & Honor Code",
-  "footer.site-footer.link.privacy": "Privacy Policy",
-  "footer.site-footer.link.accessibility": "Accessibility Policy",
-  "footer.site-footer.link.trademark": "Trademark Policy",
-  "footer.site-footer.link.sitemap": "Sitemap",
-  "footer.site-footer.link.header.connect": "Connect",
-  "footer.site-footer.link.blog": "Blog",
-  "footer.site-footer.link.contact-us": "Contact Us",
-  "footer.site-footer.link.help-center": "Help Center",
-  "footer.site-footer.link.media-kit": "Media Kit",
-  "footer.site-footer.link.donate": "Donate",
-  "footer.site-footer.copyright-text": "{copyrightSymbol} {startDate}–{endDate} {siteName} Inc.",
-  "footer.site-footer.trademark-text": "EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | {icpLicense}",
-  "footer.site-footer.site-logo.alt-text": "{siteName} logo",
-  "footer.site-footer.site-logo.aria-label": "{siteName} Home",
-  "footer.site-footer.facebook.title": "Facebook",
-  "footer.site-footer.facebook.screen-reader-text": "Like {siteName} on Facebook",
-  "footer.site-footer.twitter.title": "Twitter",
-  "footer.site-footer.twitter.screen-reader-text": "Follow {siteName} on Twitter",
-  "footer.site-footer.youtube.title": "Youtube",
-  "footer.site-footer.youtube.screen-reader-text": "Subscribe to the {siteName} YouTube channel",
-  "footer.site-footer.linkedin.title": "LinkedIn",
-  "footer.site-footer.linkedin.screen-reader-text": "Follow {siteName} on LinkedIn",
-  "footer.site-footer.google-plus.title": "Google+",
-  "footer.site-footer.google-plus.screen-reader-text": "Follow {siteName} on Google+",
-  "footer.site-footer.reddit.title": "Reddit",
-  "footer.site-footer.reddit.screen-reader-text": "Subscribe to the {siteName} subreddit",
-  "footer.site-footer.apple-app-store.alt-text": "Download the {siteName} mobile app from the Apple App Store",
-  "footer.site-footer.google-play.alt-text": "Download the {siteName} mobile app from Google Play",
-  "footer.site-footer.footer.aria-label": "Page Footer"
-}

src/lib/components/SiteFooter/__snapshots__/SiteFooter.test.jsx.snap

@@ -237,7 +237,12 @@ exports[`<SiteFooter /> renders correctly does not render business links 1`] = `
         </span>
         <br />
         <span>
-          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 粤ICP备17044299号-2
+          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 
+          <a
+            href="http://www.beian.miit.gov.cn"
+          >
+            粤ICP备17044299号-2
+          </a>
         </span>
       </p>
     </div>
@@ -482,7 +487,12 @@ exports[`<SiteFooter /> renders correctly does not render language selector 1`]
         </span>
         <br />
         <span>
-          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 粤ICP备17044299号-2
+          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 
+          <a
+            href="http://www.beian.miit.gov.cn"
+          >
+            粤ICP备17044299号-2
+          </a>
         </span>
       </p>
     </div>
@@ -949,7 +959,12 @@ exports[`<SiteFooter /> renders correctly does not render mobile links 1`] = `
         </span>
         <br />
         <span>
-          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 粤ICP备17044299号-2
+          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 
+          <a
+            href="http://www.beian.miit.gov.cn"
+          >
+            粤ICP备17044299号-2
+          </a>
         </span>
       </p>
     </div>
@@ -1261,7 +1276,12 @@ exports[`<SiteFooter /> renders correctly does not render social links 1`] = `
         </span>
         <br />
         <span>
-          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 粤ICP备17044299号-2
+          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 
+          <a
+            href="http://www.beian.miit.gov.cn"
+          >
+            粤ICP备17044299号-2
+          </a>
         </span>
       </p>
     </div>
@@ -1769,7 +1789,12 @@ exports[`<SiteFooter /> renders correctly renders with social and mobile links 1
         </span>
         <br />
         <span>
-          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 粤ICP备17044299号-2
+          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 
+          <a
+            href="http://www.beian.miit.gov.cn"
+          >
+            粤ICP备17044299号-2
+          </a>
         </span>
       </p>
     </div>

src/lib/components/SiteFooter/index.jsx

@@ -358,8 +358,8 @@ class SiteFooter extends React.Component {
               <br />
               <FormattedMessage
                 id="footer.site-footer.trademark-text"
-                defaultMessage="EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | {icpLicense}"
-                values={{ icpLicense: '粤ICP备17044299号-2' }}
+                defaultMessage="EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 {icpLicense}"
+                values={{ icpLicense: <a href="http://www.beian.miit.gov.cn">粤ICP备17044299号-2</a> }}
                 description="Footer trademark text"
               />
             </p>