remove unused var & improve keys naming

ridait · ridait · commit e8d277cdab18 · 2020-08-28T18:53:39.000+02:00
diff --git a/client/components/mobile/Explorer.jsx b/client/components/mobile/Explorer.jsx
@@ -7,9 +7,9 @@ import ConnectedFileNode from '../../modules/IDE/components/FileNode';
 
 
 const Explorer = ({ id, canEdit, onPressClose }) => {
-  const { t, i18n } = useTranslation();
+  const { t } = useTranslation();
   return (
-    <Sidebar title={t('MobileSideBar.Files')} onPressClose={onPressClose}>
+    <Sidebar title={t('Explorer.Files')} onPressClose={onPressClose}>
       <ConnectedFileNode id={id} canEdit={canEdit} onClickFile={() => onPressClose()} />
     </Sidebar>
   );
diff --git a/client/modules/IDE/components/Preferences/PreferenceCreators.jsx b/client/modules/IDE/components/Preferences/PreferenceCreators.jsx
@@ -1,13 +1,13 @@
 import { useTranslation } from 'react-i18next';
 
 export const optionsOnOff = (name) => {
-  const { t, i18n } = useTranslation();
+  const { t } = useTranslation();
   return [
     {
-      value: true, label: t('Preferences.On'), ariaLabel: `${name} on`, name: `${name}`, id: `${name}-on`.replace(' ', '-')
+      value: true, label: t('PreferenceCreators.On'), ariaLabel: `${name} on`, name: `${name}`, id: `${name}-on`.replace(' ', '-')
     },
     {
-      value: false, label: t('Preferences.Off'), ariaLabel: `${name} off`, name: `${name}`, id: `${name}-off`.replace(' ', '-')
+      value: false, label: t('PreferenceCreators.Off'), ariaLabel: `${name} off`, name: `${name}`, id: `${name}-off`.replace(' ', '-')
     }
   ];
 };
diff --git a/client/modules/IDE/pages/MobileIDEView.jsx b/client/modules/IDE/pages/MobileIDEView.jsx
@@ -65,20 +65,20 @@ const NavItem = styled.li`
 `;
 
 const getNavOptions = (username = undefined, logoutUser = () => {}, toggleForceDesktop = () => {}) => {
-  const { t, i18n } = useTranslation();
+  const { t } = useTranslation();
   return (username
     ? [
-      { icon: PreferencesIcon, title: t('MobileNav.Preferences'), href: '/preferences', },
-      { icon: PreferencesIcon, title: t('MobileNav.MyStuff'), href: `/${username}/sketches` },
-      { icon: PreferencesIcon, title: t('MobileNav.Examples'), href: '/p5/sketches' },
-      { icon: PreferencesIcon, title: t('MobileNav.OriginalEditor'), action: toggleForceDesktop, },
-      { icon: PreferencesIcon, title: t('MobileNav.Logout'), action: logoutUser, },
+      { icon: PreferencesIcon, title: t('MobileIDEView.Preferences'), href: '/preferences', },
+      { icon: PreferencesIcon, title: t('MobileIDEView.MyStuff'), href: `/${username}/sketches` },
+      { icon: PreferencesIcon, title: t('MobileIDEView.Examples'), href: '/p5/sketches' },
+      { icon: PreferencesIcon, title: t('MobileIDEView.OriginalEditor'), action: toggleForceDesktop, },
+      { icon: PreferencesIcon, title: t('MobileIDEView.Logout'), action: logoutUser, },
     ]
     : [
-      { icon: PreferencesIcon, title: t('MobileNav.Preferences'), href: '/preferences', },
-      { icon: PreferencesIcon, title: t('MobileNav.Examples'), href: '/p5/sketches' },
-      { icon: PreferencesIcon, title: t('MobileNav.OriginalEditor'), action: toggleForceDesktop, },
-      { icon: PreferencesIcon, title: t('MobileNav.Login'), href: '/login', },
+      { icon: PreferencesIcon, title: t('MobileIDEView.Preferences'), href: '/preferences', },
+      { icon: PreferencesIcon, title: t('MobileIDEView.Examples'), href: '/p5/sketches' },
+      { icon: PreferencesIcon, title: t('MobileIDEView.OriginalEditor'), action: toggleForceDesktop, },
+      { icon: PreferencesIcon, title: t('MobileIDEView.Login'), href: '/login', },
     ]
   );
 };
diff --git a/client/modules/Mobile/MobileDashboardView.jsx b/client/modules/Mobile/MobileDashboardView.jsx
@@ -139,7 +139,7 @@ const Panels = {
 
 
 const navOptions = (username) => {
-  const { t, i18n } = useTranslation();
+  const { t } = useTranslation();
   return [
     { title: t('MobileDashboardView.CreateSketch'), href: '/' },
     { title: t('MobileDashboardView.CreateCollection'), href: `/${username}/collections/create` }
@@ -166,7 +166,7 @@ const MobileDashboard = ({ params, location }) => {
   const user = useSelector(state => state.user);
   const { username: paramsUsername } = params;
   const { pathname } = location;
-  const { t, i18n } = useTranslation();
+  const { t } = useTranslation();
 
   const Tabs = Object.keys(Panels);
   const TabLabels = {
diff --git a/client/modules/Mobile/MobilePreferences.jsx b/client/modules/Mobile/MobilePreferences.jsx
@@ -44,33 +44,33 @@ const MobilePreferences = () => {
     setTheme, setAutosave, setLinewrap, setTextOutput, setGridOutput, setSoundOutput, setLineNumbers, setLintWarning,
   } = bindActionCreators({ ...PreferencesActions, ...IdeActions }, useDispatch());
 
-  const { t, i18n } = useTranslation();
+  const { t } = useTranslation();
 
   const generalSettings = [
     {
-      title: t('Preferences.Theme'),
+      title: t('MobilePreferences.Theme'),
       value: theme,
       options: optionsPickOne(
-        t('Preferences.Theme'),
-        t('Preferences.LightTheme'),
-        t('Preferences.DarkTheme'),
-        t('Preferences.HighContrastTheme')
+        t('MobilePreferences.Theme'),
+        t('MobilePreferences.LightTheme'),
+        t('MobilePreferences.DarkTheme'),
+        t('MobilePreferences.HighContrastTheme')
       ),
       onSelect: x => setTheme(x) // setTheme
     },
-    preferenceOnOff(t('Preferences.Autosave'), autosave, setAutosave, 'autosave'),
-    preferenceOnOff(t('Preferences.WordWrap'), linewrap, setLinewrap, 'linewrap')
+    preferenceOnOff(t('MobilePreferences.Autosave'), autosave, setAutosave, 'autosave'),
+    preferenceOnOff(t('MobilePreferences.WordWrap'), linewrap, setLinewrap, 'linewrap')
   ];
 
   const outputSettings = [
-    preferenceOnOff(t('Preferences.PlainText'), textOutput, setTextOutput, 'text output'),
-    preferenceOnOff(t('Preferences.TableText'), gridOutput, setGridOutput, 'table output'),
-    preferenceOnOff(t('Preferences.Sound'), soundOutput, setSoundOutput, 'sound output')
+    preferenceOnOff(t('MobilePreferences.PlainText'), textOutput, setTextOutput, 'text output'),
+    preferenceOnOff(t('MobilePreferences.TableText'), gridOutput, setGridOutput, 'table output'),
+    preferenceOnOff(t('MobilePreferences.Sound'), soundOutput, setSoundOutput, 'sound output')
   ];
 
   const accessibilitySettings = [
-    preferenceOnOff(t('Preferences.LineNumbers'), lineNumbers, setLineNumbers),
-    preferenceOnOff(t('Preferences.LintWarningSound'), lintWarning, setLintWarning)
+    preferenceOnOff(t('MobilePreferences.LineNumbers'), lineNumbers, setLineNumbers),
+    preferenceOnOff(t('MobilePreferences.LintWarningSound'), lintWarning, setLintWarning)
   ];
 
   return (
@@ -81,14 +81,14 @@ const MobilePreferences = () => {
         </Header>
         <section className="preferences">
           <Content>
-            <SectionHeader>{t('Preferences.GeneralSettings')}</SectionHeader>
+            <SectionHeader>{t('MobilePreferences.GeneralSettings')}</SectionHeader>
             { generalSettings.map(option => <PreferencePicker key={`${option.title}wrapper`} {...option} />) }
 
-            <SectionHeader>{t('Preferences.Accessibility')}</SectionHeader>
+            <SectionHeader>{t('MobilePreferences.Accessibility')}</SectionHeader>
             { accessibilitySettings.map(option => <PreferencePicker key={`${option.title}wrapper`} {...option} />) }
 
-            <SectionHeader>{t('Preferences.AccessibleOutput')}</SectionHeader>
-            <SectionSubeader>{t('Preferences.UsedScreenReader')}</SectionSubeader>
+            <SectionHeader>{t('MobilePreferences.AccessibleOutput')}</SectionHeader>
+            <SectionSubeader>{t('MobilePreferences.UsedScreenReader')}</SectionSubeader>
             { outputSettings.map(option => <PreferencePicker key={`${option.title}wrapper`} {...option} />) }
 
           </Content>
diff --git a/translations/locales/en-US/translations.json b/translations/locales/en-US/translations.json
@@ -114,7 +114,6 @@
     "Settings": "Settings",
     "GeneralSettings": "General settings",
     "Accessibility": "Accessibility",
-    "AccessibleOutput": "Accessible Output",
     "Theme": "Theme",
     "LightTheme": "Light",
     "LightThemeARIA": "light theme on",
@@ -533,7 +532,29 @@
     "EditSketchARIA": "Edit Sketch",
     "ByUser": "by"
   },
-  "MobileNav":{
+  "MobilePreferences": {
+    "Settings": "Settings",
+    "GeneralSettings": "General settings",
+    "Accessibility": "Accessibility",
+    "AccessibleOutput": "Accessible Output",
+    "Theme": "Theme",
+    "LightTheme": "Light",
+    "DarkTheme": "Dark",
+    "HighContrastTheme": "High Contrast",
+    "Autosave": "Autosave",
+    "WordWrap": "Word Wrap",
+    "LineNumbers": "Line numbers",
+    "LintWarningSound": "Lint warning sound",
+    "UsedScreenReader": "Used with screen reader",
+    "PlainText": "Plain-text",
+    "TableText": "Table-text",
+    "Sound": "Sound"
+  },
+  "PreferenceCreators": {
+    "On": "On",
+    "Off": "Off"
+  },
+  "MobileIDEView":{
     "Preferences": "Preferences",
     "MyStuff": "My Stuff",
     "Examples": "Examples",
@@ -550,7 +571,7 @@
     "CreateSketch": "Create Sketch",
     "CreateCollection": "Create Collection"
   },
-  "MobileSideBar": {
+  "Explorer": {
     "Files": "Files"
   }
 }
diff --git a/translations/locales/es-419/translations.json b/translations/locales/es-419/translations.json
@@ -114,7 +114,6 @@
     "Settings": "Configuración",
     "GeneralSettings": "Configuración general",
     "Accessibility": "Accesibilidad",
-    "AccessibleOutput": "Salida accesible",
     "Theme": "Modo de visualización",
     "LightTheme": "Claro",
     "LightThemeARIA": "Modo de visualización claro activado",
@@ -533,7 +532,29 @@
     "EditSketchARIA": "Editar Bosquejo",
     "ByUser": "por"
   },
-  "MobileNav":{
+  "MobilePreferences": {
+    "Settings": "Configuración",
+    "GeneralSettings": "Configuración general",
+    "Accessibility": "Accesibilidad",
+    "AccessibleOutput": "Salida accesible",
+    "Theme": "Modo de visualización",
+    "LightTheme": "Claro",
+    "DarkTheme": "Oscuro",
+    "HighContrastTheme": "Alto contraste",
+    "Autosave": "Grabar automáticamente",
+    "WordWrap": "Ajuste automático de línea",
+    "LineNumbers": "Número de línea",
+    "LintWarningSound": "Sonido de alarma Lint",
+    "UsedScreenReader": "Uso con screen reader",
+    "PlainText": "Texto sin formato",
+    "TableText": "Tablero de texto",
+    "Sound": "Sonido"
+  },
+  "PreferenceCreators": {
+    "On": "Activar",
+    "Off": "Desactivar"
+  },
+  "MobileIDEView":{
     "Preferences": "Preferencias",
     "MyStuff": "Mis cosas",
     "Examples": "Ejemplos",
@@ -550,7 +571,7 @@
     "CreateSketch": "Crear bosquejo",
     "CreateCollection": "Crear colección"
   },
-  "MobileSideBar": {
+  "Explorer": {
     "Files": "Archivos"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`import { useTranslation } from 'react-i18next';`
`2`	`2`
`3`	`3`	`export const optionsOnOff = (name) => {`
`4`		`- const { t, i18n } = useTranslation();`
	`4`	`+ const { t } = useTranslation();`
`5`	`5`	`return [`
`6`	`6`	`{`
`7`		- value: true, label: t('Preferences.On'), ariaLabel: `${name} on`, name: `${name}`, id: `${name}-on`.replace(' ', '-')
	`7`	+ value: true, label: t('PreferenceCreators.On'), ariaLabel: `${name} on`, name: `${name}`, id: `${name}-on`.replace(' ', '-')
`8`	`8`	`},`
`9`	`9`	`{`
`10`		- value: false, label: t('Preferences.Off'), ariaLabel: `${name} off`, name: `${name}`, id: `${name}-off`.replace(' ', '-')
	`10`	+ value: false, label: t('PreferenceCreators.Off'), ariaLabel: `${name} off`, name: `${name}`, id: `${name}-off`.replace(' ', '-')
`11`	`11`	`}`
`12`	`12`	`];`
`13`	`13`	`};`