Merge pull request #26 from edx/alasdair/version-bump

fix(version): trivial update to minor version bump
2019-05-07 12:12:33 -04:00 · 2019-05-07 11:56:32 -04:00 · 2019-05-07 11:30:02 -04:00 · 2019-05-07 11:24:04 -04:00 · 2019-05-07 10:29:25 -04:00 · 2019-05-06 15:08:50 -04:00
9 changed files with 5519 additions and 5362 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ install:
  - npm install
 script:
  - npm run lint
+  - npm run i18n_extract
  - npm run test
  - npm run build
 after_success:
--- a/2
+++ b/2
@@ -12,7 +12,7 @@ i18n.concat:
    # Gathering JSON messages into one file...
 	./src/i18n/i18n-concat.js ./temp/src ./src/i18n/transifex_input.json

-i18n.pre_validate: | 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/
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/i18n/i18n-concat.js
+++ b/src/i18n/i18n-concat.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
+
 /**
- * This code originally came from https://github.com/efischer19/reactifex/blob/master/main.js,
- * which should be edx/reactifex. It is temporarily being copied here until we find it a new home.
+ * See the Makefile for how the required hash file is downloaded from Transifex.
 */

 // NOTE: This script is called from Jenkins using devDependencies, so eslint is being
@@ -23,28 +23,36 @@ function gatherJson(dir) {
  return ret;
 }

+// the hash file returns ids whose periods are "escaped" (sort of), like this:
+// "key": "profile\\.sociallinks\\.social\\.links"
+// so our regular messageIds won't match them out of the box
+function escapeDots(messageId) {
+  return messageId.replace(/\./g, '\\.');
+}
+
 const jsonDir = process.argv[2];
 const messageObjects = gatherJson(jsonDir);

 if (process.argv[3] === '--comments') { // prepare to handle the translator notes
-  const thisFile = path.basename(`${__filename}`);
+  const loggingPrefix = path.basename(`${__filename}`); // the name of this JS file
  const bashScriptsPath = './node_modules/reactifex/bash_scripts';

-  process.stdout.write(`${thisFile}: generating bash scripts...\n`);
-  process.stdout.write(`${thisFile}: info file at ${bashScriptsPath}/hashmap.json\n`);
+  const hashFile = `${bashScriptsPath}/hashmap.json`;
+  process.stdout.write(`${loggingPrefix}: reading hash file ${hashFile}\n`);
+  const messageInfo = JSON.parse(fs.readFileSync(hashFile));

-  const messageInfo = JSON.parse(fs.readFileSync(`${bashScriptsPath}/hashmap.json`));
-  const dataPath = `${bashScriptsPath}/hashed_data.txt`;
-
-  process.stdout.write(`${thisFile}: data path is ${dataPath}\n`);
-  fs.writeFileSync(dataPath, '');
+  const outputFile = `${bashScriptsPath}/hashed_data.txt`;
+  process.stdout.write(`${loggingPrefix}: writing to output file ${outputFile}\n`);
+  fs.writeFileSync(outputFile, '');

  messageObjects.forEach((message) => {
-    const info = messageInfo.find(mi => mi.key === message.id);
+    const transifexFormatId = escapeDots(message.id);
+
+    const info = messageInfo.find(mi => mi.key === transifexFormatId);
    if (info) {
-      fs.appendFileSync(dataPath, `${info.string_hash}|${message.description}\n`);
+      fs.appendFileSync(outputFile, `${info.string_hash}|${message.description}\n`);
    } else {
-      process.stdout.write(`${thisFile}: string ${message.id} does not yet exist on transifex!\n`);
+      process.stdout.write(`${loggingPrefix}: string ${message.id} does not yet exist on transifex!\n`);
    }
  });
 } else {
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -1,2 +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.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"
+}
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -1,2 +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.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"
+}
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -1,2 +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.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"
+}
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -1,2 +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.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"
+}
--- a/src/lib/components/SiteFooter/SiteFooter.test.jsx
+++ b/src/lib/components/SiteFooter/SiteFooter.test.jsx
@@ -22,8 +22,8 @@ const completeSiteFooterComponent = mockHandleAllTrackEvents =>
        twitterUrl="https://www.twitter.com"
        youTubeUrl="https://www.youtube.com"
        linkedInUrl="https://www.linkedin.com"
-        googlePlusUrl="https://plus.google.com"
        redditUrl="https://reddit.com"
+        googlePlusUrl="https://plus.google.com"
        appleAppStoreUrl="https://store.apple.com"
        googlePlayUrl="https://play.google.com"
        handleAllTrackEvents={mockHandleAllTrackEvents}
@@ -58,8 +58,8 @@ describe('<SiteFooter />', () => {
              twitterUrl="https://www.twitter.com"
              youTubeUrl="https://www.youtube.com"
              linkedInUrl="https://www.linkedin.com"
-              googlePlusUrl="https://plus.google.com"
              redditUrl="https://reddit.com"
+              googlePlusUrl="https://plus.google.com"
              appleAppStoreUrl="https://store.apple.com"
              googlePlayUrl="https://play.google.com"
              handleAllTrackEvents={jest.fn()}
@@ -87,8 +87,8 @@ describe('<SiteFooter />', () => {
              twitterUrl="https://www.twitter.com"
              youTubeUrl="https://www.youtube.com"
              linkedInUrl="https://www.linkedin.com"
-              googlePlusUrl="https://plus.google.com"
              redditUrl="https://reddit.com"
+              googlePlusUrl="https://plus.google.com"
              appleAppStoreUrl="https://store.apple.com"
              googlePlayUrl="https://play.google.com"
              handleAllTrackEvents={jest.fn()}
Author	SHA1	Message	Date
AlasdairSwan	5aae6e8336	Merge pull request #26 from edx/alasdair/version-bump fix(version): trivial update to minor version bump	2019-05-07 12:12:33 -04:00
AlasdairSwan	ae18ad45b9	fix(version): trivial update to minor version bump	2019-05-07 11:56:32 -04:00
AlasdairSwan	0e15bb7e55	Merge pull request #24 from edx/alasdair/revert-social-media-links Revert social media links PR	2019-05-07 11:30:02 -04:00
AlasdairSwan	ff664b9d3b	Revert social media links PR	2019-05-07 11:24:04 -04:00
AlasdairSwan	da91fb6392	Merge pull request #23 from edx/alasdair/fontawesome-svg-and-social-link-array-prop fix(sociallinks): array for social props BREAKING CHANGE: props change	2019-05-07 10:29:25 -04:00
AlasdairSwan	f265c7daa6	fix(sociallinks): array for social props BREAKING CHANGE: props change	2019-05-06 15:08:50 -04:00
albemarle	3037e4d8a6	Merge pull request #22 from edx/albemarle/i18n-travis build: validate i18n	2019-05-06 10:20:20 -04:00
albemarle	b2a7696c0e	build: validate i18n	2019-05-03 15:32:30 -04:00
albemarle	6dc8f64ccb	Merge pull request #19 from edx/albemarle/more-i18n fix(i18n): use up-to-date i18n-concat.js	2019-04-09 15:46:31 -04:00
albemarle	0453d7fbaa	fix(i18n): use up-to-date i18n-concat.js	2019-04-09 15:38:46 -04:00
Robert Raposa	fa6d38f422	Merge pull request #18 from edx/albemarle/check-changes fix(i18n): add detect_changed_source_translations target to stop jobs erroring	2019-04-05 16:52:44 -04:00
albemarle	9f3e945d4e	fix(i18n): add detect_changed_source_translations target to stop jobs erroring	2019-04-05 16:42:50 -04:00
edX Transifex Bot	429d19291d	fix(i18n): update translations	2019-04-05 16:21:24 -04:00