From b729377a2cfc421f02fb6bcb3b67dde376fe17d8 Mon Sep 17 00:00:00 2001
From: "Christian M. Adams" <rooftopcellist@gmail.com>
Date: Wed, 24 Mar 2021 15:47:16 -0400
Subject: [PATCH] Fix syntax error with fr translations

---
 awx/ui_next/src/App.jsx                                    | 7 +++++++
 awx/ui_next/src/locales/fr/messages.po                     | 4 ++--
 .../src/screens/Template/shared/JobTemplateForm.jsx        | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/awx/ui_next/src/App.jsx b/awx/ui_next/src/App.jsx
index a6f1718a0e..af03b8e712 100644
--- a/awx/ui_next/src/App.jsx
+++ b/awx/ui_next/src/App.jsx
@@ -17,6 +17,12 @@ import Background from './components/Background';
 import NotFound from './screens/NotFound';
 import Login from './screens/Login';
 
+import en from './locales/en/messages';
+import es from './locales/es/messages';
+import fr from './locales/fr/messages';
+import ja from './locales/ja/messages';
+import nl from './locales/nl/messages';
+import zh from './locales/zh/messages';
 import { isAuthenticated } from './util/auth';
 import { getLanguageWithoutRegionCode } from './util/language';
 import { dynamicActivate, locales } from './i18nLoader';
@@ -78,6 +84,7 @@ const ProtectedRoute = ({ children, ...rest }) =>
   );
 
 function App() {
+  const catalogs = { en, es, fr, ja, nl, zh };
   let language = getLanguageWithoutRegionCode(navigator);
   if (!Object.keys(locales).includes(language)) {
     // If there isn't a string catalog available for the browser's
diff --git a/awx/ui_next/src/locales/fr/messages.po b/awx/ui_next/src/locales/fr/messages.po
index 93a2050025..74c3384dc9 100644
--- a/awx/ui_next/src/locales/fr/messages.po
+++ b/awx/ui_next/src/locales/fr/messages.po
@@ -2504,8 +2504,8 @@ msgid "Enabled Variable"
 msgstr "Variable activée"
 
 #: src/screens/Template/shared/JobTemplateForm.jsx:517
-msgid "Enables creation of a provisioning callback URL. Using the URL a host can contact BRAND_NAME and request a configuration update using this job template."
-msgstr "Active la création d'une URL de rappel d’exécution. Avec cette URL, un hôte peut contacter {{BRAND_NAME}} et demander une mise à jour de la configuration à l'aide de ce modèle de job."
+msgid "Enables creation of a provisioning callback URL. Using the URL a host can contact {brandName} and request a configuration update using this job template."
+msgstr "Active la création d'une URL de rappel d’exécution. Avec cette URL, un hôte peut contacter {brandName} et demander une mise à jour de la configuration à l'aide de ce modèle de job."
 
 #: src/components/AdHocCommands/AdHocDetailsStep.jsx:244
 msgid "Enables creation of a provisioning callback URL. Using the URL a host can contact {brandName} and request a configuration update using this job template"
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
index b7d7ef8a2e..d6075fd1d4 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
@@ -13,6 +13,7 @@ import {
 } from '@patternfly/react-core';
 import ContentError from '../../../components/ContentError';
 import ContentLoading from '../../../components/ContentLoading';
+import { BrandName } from '../../../variables';
 import AnsibleSelect from '../../../components/AnsibleSelect';
 import { TagMultiSelect } from '../../../components/MultiSelect';
 import useRequest from '../../../util/useRequest';
@@ -545,7 +546,7 @@ function JobTemplateForm({
                         &nbsp;
                         <Popover
                           content={i18n._(t`Enables creation of a provisioning
-                              callback URL. Using the URL a host can contact BRAND_NAME
+                              callback URL. Using the URL a host can contact ${BrandName}
                               and request a configuration update using this job
                               template.`)}
                         />