Browse Source

Updated translations and fixed filenames

Arnaud Vergnet 3 years ago
parent
commit
b151a8ff6f

+ 11
- 13
src/navigation/MainTabNavigator.js View File

@@ -28,8 +28,8 @@ import {AmicaleWebsiteScreen} from "../screens/Websites/AmicaleWebsiteScreen";
28 28
 import {ElusEtudiantsWebsiteScreen} from "../screens/Websites/ElusEtudiantsWebsiteScreen";
29 29
 import {WiketudWebsiteScreen} from "../screens/Websites/WiketudWebsiteScreen";
30 30
 import {TutorInsaWebsiteScreen} from "../screens/Websites/TutorInsaWebsiteScreen";
31
-import {ENTWebsiteScreen} from "../screens/Websites/ENTWebsiteScreen.js";
32
-import {BlueMindWebsiteScreen} from "../screens/Websites/BlueMindWebsiteScreen.js";
31
+import {ENTWebsiteScreen} from "../screens/Websites/ENTWebsiteScreen";
32
+import {BlueMindWebsiteScreen} from "../screens/Websites/BlueMindWebsiteScreen";
33 33
 import LoginScreen from "../screens/Amicale/LoginScreen";
34 34
 import ProfileScreen from "../screens/Amicale/ProfileScreen";
35 35
 import ClubListScreen from "../screens/Amicale/Clubs/ClubListScreen";
@@ -91,7 +91,7 @@ function ServicesStackComponent() {
91 91
             headerMode={"screen"}
92 92
             screenOptions={defaultScreenOptions}
93 93
         >
94
-            {createScreenCollapsibleStack("index", ServicesStack, WebsitesHomeScreen, "SERVICES")}
94
+            {createScreenCollapsibleStack("index", ServicesStack, WebsitesHomeScreen, i18n.t('screens.services'))}
95 95
 
96 96
             {createScreenCollapsibleStack("proximo", ServicesStack, ProximoMainScreen, "Proximo")}
97 97
             {createScreenCollapsibleStack(
@@ -111,11 +111,9 @@ function ServicesStackComponent() {
111 111
                 }}
112 112
             />
113 113
 
114
-
115
-            {/*{createScreenCollapsibleStack("index", PlanningStack, InsaHomeScreen, "INSA HOME")}*/}
116
-            {getWebsiteStack("available-rooms", PlanningStack, AvailableRoomScreen, i18n.t('screens.availableRooms'))}
117
-            {getWebsiteStack("bib", PlanningStack, BibScreen, i18n.t('screens.bib'))}
118
-            {createScreenCollapsibleStack("self-menu", PlanningStack, SelfMenuScreen, i18n.t('screens.menuSelf'))}
114
+            {getWebsiteStack("available-rooms", ServicesStack, AvailableRoomScreen, i18n.t('screens.availableRooms'))}
115
+            {getWebsiteStack("bib", ServicesStack, BibScreen, i18n.t('screens.bib'))}
116
+            {createScreenCollapsibleStack("self-menu", ServicesStack, SelfMenuScreen, i18n.t('screens.menuSelf'))}
119 117
 
120 118
             {getWebsiteStack("amicale-website", ServicesStack, AmicaleWebsiteScreen, "Amicale")}
121 119
             {getWebsiteStack("elus-etudiants", ServicesStack, ElusEtudiantsWebsiteScreen, "Élus Étudiants")}
@@ -158,14 +156,14 @@ function PlanningStackComponent() {
158 156
             headerMode={"screen"}
159 157
             screenOptions={defaultScreenOptions}
160 158
         >
161
-            <ServicesStack.Screen
159
+            <PlanningStack.Screen
162 160
                 name="planning"
163 161
                 component={PlanningScreen}
164 162
                 options={{
165 163
                     title: i18n.t('screens.planning'),
166 164
                 }}
167 165
             />
168
-            <ServicesStack.Screen
166
+            <PlanningStack.Screen
169 167
                 name="planning-information"
170 168
                 component={PlanningDisplayScreen}
171 169
                 options={{
@@ -239,7 +237,7 @@ function HomeStackComponent(initialRoute: string | null, defaultData: { [key: st
239 237
                     ...modalTransition,
240 238
                 }}
241 239
             />
242
-            {createScreenCollapsibleStack("self-menu", PlanningStack, SelfMenuScreen, i18n.t('screens.menuSelf'), true, {...modalTransition})}
240
+            {createScreenCollapsibleStack("self-menu", HomeStack, SelfMenuScreen, i18n.t('screens.menuSelf'), true, {...modalTransition})}
243 241
 
244 242
             <HomeStack.Screen
245 243
                 name="login"
@@ -346,7 +344,7 @@ export default class TabNavigator extends React.Component<Props> {
346 344
                     name="services"
347 345
                     option
348 346
                     component={ServicesStackComponent}
349
-                    options={{title: "SERVICES"}}
347
+                    options={{title: i18n.t('screens.services')}}
350 348
                 />
351 349
 
352 350
                 <Tab.Screen
@@ -357,7 +355,7 @@ export default class TabNavigator extends React.Component<Props> {
357 355
                 <Tab.Screen
358 356
                     name="planning"
359 357
                     component={PlanningStackComponent}
360
-                    options={{title: "EVENTS"}}
358
+                    options={{title: i18n.t('screens.planning')}}
361 359
                 />
362 360
 
363 361
                 <Tab.Screen

src/screens/Websites/BlueMindWebsiteScreen.js.js → src/screens/Websites/BlueMindWebsiteScreen.js View File


src/screens/Websites/ENTWebsiteScreen.js.js → src/screens/Websites/ENTWebsiteScreen.js View File


+ 2
- 1
translations/en.json View File

@@ -1,13 +1,14 @@
1 1
 {
2 2
   "screens": {
3 3
     "home": "Home",
4
-    "planning": "Planning",
4
+    "planning": "Events",
5 5
     "planningDisplayScreen": "Event details",
6 6
     "clubDisplayScreen": "Club details",
7 7
     "feedDisplayScreen": "Details",
8 8
     "clubsAbout": "Clubs",
9 9
     "amicaleAbout": "The Amicale",
10 10
     "proxiwash": "Proxiwash",
11
+    "services": "Services",
11 12
     "proximo": "Proximo",
12 13
     "proximoArticles": "Articles",
13 14
     "menuSelf": "RU Menu",

+ 2
- 1
translations/fr.json View File

@@ -1,13 +1,14 @@
1 1
 {
2 2
   "screens": {
3 3
     "home": "Accueil",
4
-    "planning": "Planning",
4
+    "planning": "Événements",
5 5
     "planningDisplayScreen": "Détails",
6 6
     "clubDisplayScreen": "Détails",
7 7
     "feedDisplayScreen": "Détails",
8 8
     "clubsAbout": "Les Clubs",
9 9
     "amicaleAbout": "L' Amicale",
10 10
     "proxiwash": "Proxiwash",
11
+    "services": "Services",
11 12
     "proximo": "Proximo",
12 13
     "proximoArticles": "Articles",
13 14
     "menuSelf": "Menu du RU",

Loading…
Cancel
Save