feat!: remove broken transifex and use atlas exclusively | FC-0012 (#164 )

* feat!: remove broken transifex and use atlas exclusively * feat: install openedx-atlas
fix: date format depends on locale date format (#174 )
2023-11-17 13:27:02 -03:00 · 2023-11-16 07:22:43 -03:00 · 2023-11-14 12:37:04 -03:00 · 2023-11-14 12:33:34 -03:00 · 2023-10-18 11:13:23 +05:00
9 changed files with 52 additions and 60 deletions
--- a/.tx/config
+++ b/.tx/config
@@ -1,8 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[o:open-edx:p:edx-platform:r:frontend-app-communications]
-file_filter = src/i18n/messages/<lang>.json
-source_file = src/i18n/transifex_input.json
-source_lang = en
-type = KEYVALUEJSON
--- a/31
+++ b/31
@@ -1,6 +1,3 @@
-export TRANSIFEX_RESOURCE = frontend-app-communications
-transifex_langs = "ar,fr,es_419,zh_CN"
-
 intl_imports = ./node_modules/.bin/intl-imports.js
 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n
@@ -32,35 +29,17 @@ 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
 	cd src/i18n/messages \
-      && atlas pull --filter=$(transifex_langs) \
-               translations/frontend-component-header/src/i18n/messages:frontend-component-header  \
-               translations/frontend-component-footer/src/i18n/messages:frontend-component-footer \
-               translations/paragon/src/i18n/messages:paragon \
-               translations/frontend-app-communications/src/i18n/messages:frontend-app-communications
+	   && atlas pull \
+	            translations/frontend-component-header/src/i18n/messages:frontend-component-header  \
+	            translations/frontend-component-footer/src/i18n/messages:frontend-component-footer \
+	            translations/paragon/src/i18n/messages:paragon \
+	            translations/frontend-app-communications/src/i18n/messages:frontend-app-communications

 	$(intl_imports) frontend-component-header frontend-component-footer paragon frontend-app-communications
-endif

 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,8 @@
        "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
        "@edx/frontend-component-footer": "12.2.0",
        "@edx/frontend-component-header": "4.6.0",
-        "@edx/frontend-platform": "5.0.0",
+        "@edx/frontend-platform": "5.5.2",
+        "@edx/openedx-atlas": "^0.5.0",
        "@edx/paragon": "^20.44.0",
        "@edx/tinymce-language-selector": "1.1.0",
        "@fortawesome/fontawesome-svg-core": "1.2.36",
@@ -3020,8 +3021,9 @@
      }
    },
    "node_modules/@edx/frontend-platform": {
-      "version": "5.0.0",
-      "license": "AGPL-3.0",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-5.5.2.tgz",
+      "integrity": "sha512-cbUvWcFL/mTc7eypBS/BnCojgWDcJCe3h3ffb3GD7F+Y4ysrFBJYf031qPcgmWNUrN30452dR7r1+sqE7uVvYA==",
      "dependencies": {
        "@cospired/i18n-iso-languages": "4.1.0",
        "@formatjs/intl-pluralrules": "4.3.3",
@@ -3049,7 +3051,7 @@
      },
      "peerDependencies": {
        "@edx/frontend-build": ">= 8.1.0 || ^12.9.0-alpha.1",
-        "@edx/paragon": ">= 10.0.0 < 21.0.0",
+        "@edx/paragon": ">= 10.0.0 < 22.0.0",
        "prop-types": "^15.7.2",
        "react": "^16.9.0 || ^17.0.0",
        "react-dom": "^16.9.0 || ^17.0.0",
@@ -3065,6 +3067,14 @@
        "@newrelic/publish-sourcemap": "^5.0.1"
      }
    },
+    "node_modules/@edx/openedx-atlas": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@edx/openedx-atlas/-/openedx-atlas-0.5.0.tgz",
+      "integrity": "sha512-wgcquAVj2BVw1rS7m1LZzUg6wVku37gs/Ks14LPWefpEIQ0HcTFV4nkg8dWfGX5dP3GiEp8s1Up7XwXzlErQhQ==",
+      "bin": {
+        "atlas": "atlas"
+      }
+    },
    "node_modules/@edx/paragon": {
      "version": "20.46.2",
      "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-20.46.2.tgz",
--- a/package.json
+++ b/package.json
@@ -36,7 +36,8 @@
    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
    "@edx/frontend-component-footer": "12.2.0",
    "@edx/frontend-component-header": "4.6.0",
-    "@edx/frontend-platform": "5.0.0",
+    "@edx/frontend-platform": "5.5.2",
+    "@edx/openedx-atlas": "^0.5.0",
    "@edx/paragon": "^20.44.0",
    "@edx/tinymce-language-selector": "1.1.0",
    "@fortawesome/fontawesome-svg-core": "1.2.36",
--- a/public/index.html
+++ b/public/index.html
@@ -4,6 +4,7 @@
      <title>Communications | <%= process.env.SITE_NAME %></title>
      <meta charset="utf-8">
      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <link rel="shortcut icon" href="<%=htmlWebpackPlugin.options.FAVICON_URL%>" type="image/x-icon" />
  </head>
  <body>
    <div id="root"></div>
--- a/src/components/bulk-email-tool/bulk-email-form/ScheduleEmailForm.jsx
+++ b/src/components/bulk-email-tool/bulk-email-form/ScheduleEmailForm.jsx
@@ -9,6 +9,8 @@ function ScheduleEmailForm(props) {
  const isMobile = useMobileResponsive();
  const { isValid, onDateTimeChange, dateTime } = props;
  const { date, time } = dateTime;
+  const descriptionDate = new Date();
+  descriptionDate.setDate(new Date().getDate() + 1);
  return (
    <Form.Group>
      <div className={classNames('d-flex', isMobile ? 'flex-column' : 'flex-row', 'my-3')}>
@@ -30,7 +32,10 @@ function ScheduleEmailForm(props) {
          <small className="text-gray-500 x-small">
            <FormattedMessage
              id="bulk.email.form.schedule.date.description"
-              defaultMessage="Enter a start date, e.g. 11/27/2023"
+              defaultMessage="Enter a start date, e.g. {date}"
+              values={{
+                date: descriptionDate.toLocaleDateString(),
+              }}
            />
          </small>
        </div>
@@ -52,7 +57,10 @@ function ScheduleEmailForm(props) {
          <small className="text-gray-500 x-small">
            <FormattedMessage
              id="bulk.email.form.schedule.time.description"
-              defaultMessage="Enter a start time, e.g. 09:00 AM"
+              defaultMessage="Enter a start time, e.g. {time}"
+              values={{
+                time: descriptionDate.toLocaleTimeString([], { timeStyle: 'short' }),
+              }}
            />
          </small>
        </div>
--- a/src/components/bulk-email-tool/bulk-email-task-manager/bulk-email-scheduled-emails-table/BulkEmailScheduledEmailsTable.jsx
+++ b/src/components/bulk-email-tool/bulk-email-task-manager/bulk-email-scheduled-emails-table/BulkEmailScheduledEmailsTable.jsx
@@ -26,6 +26,7 @@ function flattenScheduledEmailsArray(emails) {
    emailId: email.courseEmail.id,
    task: email.task,
    taskDue: new Date(email.taskDue).toLocaleString(),
+    taskDueUTC: email.taskDue,
    ...email.courseEmail,
    targets: email.courseEmail.targets.join(', '),
  }));
@@ -91,10 +92,10 @@ function BulkEmailScheduledEmailsTable({ intl }) {
  const handleEditEmail = (row) => {
    const {
      original: {
-        htmlMessage: emailBody, subject: emailSubject, taskDue, targets, schedulingId, emailId,
+        htmlMessage: emailBody, subject: emailSubject, taskDueUTC, targets, schedulingId, emailId,
      },
    } = row;
-    const dateTime = new Date(taskDue);
+    const dateTime = new Date(taskDueUTC);
    const emailRecipients = targets.replaceAll('-', ':').split(', ');
    const scheduleDate = formatDate(dateTime);
    const scheduleTime = formatTime(dateTime);
--- a/src/components/page-container/PageContainer.jsx
+++ b/src/components/page-container/PageContainer.jsx
@@ -66,9 +66,11 @@ export default function PageContainer(props) {
            courseNumber={courseMetadata.number}
            courseTitle={courseMetadata.title}
          />
-          <main>
-            {children}
-          </main>
+          <div className="pb-3 container">
+            <main>
+              {children}
+            </main>
+          </div>
          <Footer />
        </>
      </CourseMetadataContext.Provider>
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -21,20 +21,18 @@ subscribe(APP_READY, () => {
      <Helmet>
        <link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
      </Helmet>
-      <div className="pb-3 container">
-        <Routes>
-          <Route
-            path="/courses/:courseId/bulk_email"
-            element={(
-              <AuthenticatedPageRoute>
-                <PageContainer>
-                  <BulkEmailTool />
-                </PageContainer>
-              </AuthenticatedPageRoute>
-            )}
-          />
-        </Routes>
-      </div>
+      <Routes>
+        <Route
+          path="/courses/:courseId/bulk_email"
+          element={(
+            <AuthenticatedPageRoute>
+              <PageContainer>
+                <BulkEmailTool />
+              </PageContainer>
+            </AuthenticatedPageRoute>
+          )}
+        />
+      </Routes>
    </AppProvider>,
    document.getElementById('root'),
  );
Author	SHA1	Message	Date
Omar Al-Ithawi	39c18ac4fa	feat!: remove broken transifex and use atlas exclusively \| FC-0012 (#164 ) * feat!: remove broken transifex and use atlas exclusively * feat: install openedx-atlas	2023-11-17 13:27:02 -03:00
Ihor Romaniuk	a4b7b5f28d	fix: date format depends on locale date format (#174 )	2023-11-16 07:22:43 -03:00
Stanislav Lunyachek	42797240df	fix: Missed favicon in Safari	2023-11-14 12:37:04 -03:00
vladislavkeblysh	ce1e7d040e	feat: fixed layout	2023-11-14 12:33:34 -03:00
Syed Ali Abbas Zaidi	3e7ea6a3e5	chore: bump frontend-platform (#158 )	2023-10-18 11:13:23 +05:00