Merge pull request #7936 from rebeccaalpert/update-modal

Bug 1920684: Update language preferences modal
openshift · Feb 2, 2021 · 0c0600c · 0c0600c
2 parents fe07ef0 + 40f6498
commit 0c0600c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 18 deletions.
diff --git a/frontend/public/components/masthead-toolbar.jsx b/frontend/public/components/masthead-toolbar.jsx
@@ -438,7 +438,7 @@ class MastheadToolbarContents_ extends React.Component {
     const actions = [];
     const userActions = [
       {
-        label: t('masthead~Language preferences'),
+        label: t('masthead~Language preference'),
         callback: () => languagePreferencesModal({}),
         component: 'button',
         dataTest: 'language',

diff --git a/frontend/public/components/modals/language-preferences-modal.tsx b/frontend/public/components/modals/language-preferences-modal.tsx
@@ -36,13 +36,8 @@ const LanguagePreferencesModal = (props: LanguagePreferencesModalProps) => {
 
   return (
     <form onSubmit={submit} name="form" className="modal-content modal-content--no-inner-scroll">
-      <ModalTitle>{t('language-preferences-modal~Edit language preferences')}</ModalTitle>
+      <ModalTitle>{t('language-preferences-modal~Edit language preference')}</ModalTitle>
       <ModalBody>
-        <p>
-          {t(
-            'language-preferences-modal~All interface content will appear in your selected language.',
-          )}
-        </p>
         <div className="form-group">
           <label htmlFor="language_dropdown">{t('language-preferences-modal~Language')}</label>
           <Dropdown

diff --git a/frontend/public/locales/en/language-preferences-modal.json b/frontend/public/locales/en/language-preferences-modal.json
@@ -1,6 +1,5 @@
 {
-  "Edit language preferences": "Edit language preferences",
-  "All interface content will appear in your selected language.": "All interface content will appear in your selected language.",
+  "Edit language preference": "Edit language preference",
   "Language": "Language",
   "Select language": "Select language"
 }
diff --git a/frontend/public/locales/en/masthead.json b/frontend/public/locales/en/masthead.json
@@ -6,7 +6,7 @@
   "Documentation": "Documentation",
   "Command line tools": "Command line tools",
   "About": "About",
-  "Language preferences": "Language preferences",
+  "Language preference": "Language preference",
   "Copy login command": "Copy login command",
   "Log out": "Log out",
   "Import YAML": "Import YAML",

diff --git a/frontend/public/locales/ja/language-preferences-modal.json b/frontend/public/locales/ja/language-preferences-modal.json
@@ -1,6 +1,6 @@
 {
-  "Edit language preferences": "言語設定の編集",
+  "Edit language preference": "言語設定の編集",
   "All interface content will appear in your selected language.": "すべてのインターフェースコンテンツが選択した言語に表示されます。",
   "Language": "言語",
   "Select language": "言語の選択"
-}
+}
diff --git a/frontend/public/locales/ja/masthead.json b/frontend/public/locales/ja/masthead.json
@@ -6,7 +6,7 @@
   "Documentation": "ドキュメント",
   "Command line tools": "コマンドラインツール",
   "About": "概要",
-  "Language preferences": "言語設定",
+  "Language preference": "言語設定",
   "Copy login command": "ログインコマンドのコピー",
   "Log out": "ログアウト",
   "Import YAML": "YAML のインポート",
@@ -15,4 +15,4 @@
   "Notification drawer": "通知ドロワー",
   "Help menu": "ヘルプメニュー",
   "Quick starts": "クイックスタート"
-}
+}
diff --git a/frontend/public/locales/zh/language-preferences-modal.json b/frontend/public/locales/zh/language-preferences-modal.json
@@ -1,6 +1,6 @@
 {
-  "Edit language preferences": "编辑语言首选项",
+  "Edit language preference": "编辑语言首选项",
   "All interface content will appear in your selected language.": "所有界面内容都会以您选择的语言出现。",
   "Language": "语言",
   "Select language": "选择语言"
-}
+}
diff --git a/frontend/public/locales/zh/masthead.json b/frontend/public/locales/zh/masthead.json
@@ -6,12 +6,12 @@
   "Documentation": "文档",
   "Command line tools": "命令行工具",
   "About": "关于",
-  "Language preferences": "语言首选项",
+  "Language preference": "语言首选项",
   "Copy login command": "复制登录命令",
   "Log out": "登出",
   "Import YAML": "导入 YAML",
   "Utility menu": "工具程序菜单",
   "User menu": "用户菜单",
   "Notification drawer": "通知抽屉",
   "Help menu": "帮助菜单"
-}
+}