Browse Source

Updated translations

Arnaud Vergnet 3 years ago
parent
commit
e8fc8b79dc

+ 5
- 2
src/components/Home/ActionsDashboardItem.js View File

@@ -5,6 +5,7 @@ import {Avatar, Card, List, withTheme} from 'react-native-paper';
5 5
 import {StyleSheet} from "react-native";
6 6
 import {DrawerNavigationProp} from "@react-navigation/drawer";
7 7
 import type {CustomTheme} from "../../managers/ThemeManager";
8
+import i18n from 'i18n-js';
8 9
 
9 10
 const ICON_AMICALE = require("../../../assets/amicale.png");
10 11
 
@@ -29,8 +30,10 @@ class ActionsDashBoardItem extends React.Component<Props> {
29 30
                 borderColor: this.props.theme.colors.primary,
30 31
             }}>
31 32
                 <List.Item
32
-                    title={"AMICALE"}
33
-                    description={isLoggedIn ? "VOTRE ESPACE" : "SE CONNECTER"}
33
+                    title={i18n.t("homeScreen.dashboard.amicaleTitle")}
34
+                    description={isLoggedIn
35
+                        ? i18n.t("homeScreen.dashboard.amicaleConnected")
36
+                        : i18n.t("homeScreen.dashboard.amicaleConnect")}
34 37
                     left={props => <Avatar.Image
35 38
                         {...props}
36 39
                         size={40}

+ 4
- 4
src/navigation/MainTabNavigator.js View File

@@ -100,7 +100,7 @@ function ServicesStackComponent() {
100 100
             {createScreenCollapsibleStack("self-menu", ServicesStack, SelfMenuScreen, i18n.t('screens.menuSelf'))}
101 101
 
102 102
             {/*     STUDENTS     */}
103
-            {createScreenCollapsibleStack("proximo", ServicesStack, ProximoMainScreen, "Proximo")}
103
+            {createScreenCollapsibleStack("proximo", ServicesStack, ProximoMainScreen, i18n.t('screens.proximo'))}
104 104
             {createScreenCollapsibleStack(
105 105
                 "proximo-list",
106 106
                 ServicesStack,
@@ -117,12 +117,12 @@ function ServicesStackComponent() {
117 117
                     ...modalTransition,
118 118
                 }}
119 119
             />
120
-            {getWebsiteStack("amicale-website", ServicesStack, AmicaleWebsiteScreen, "Amicale")}
120
+            {getWebsiteStack("amicale-website", ServicesStack, AmicaleWebsiteScreen, i18n.t('screens.amicaleWebsite'))}
121 121
             {getWebsiteStack("elus-etudiants", ServicesStack, ElusEtudiantsWebsiteScreen, "Élus Étudiants")}
122 122
             {getWebsiteStack("wiketud", ServicesStack, WiketudWebsiteScreen, "Wiketud")}
123 123
             {getWebsiteStack("tutorinsa", ServicesStack, TutorInsaWebsiteScreen, "Tutor'INSA")}
124
-            {getWebsiteStack("ent", ServicesStack, ENTWebsiteScreen, "ENT INSA")}
125
-            {getWebsiteStack("bluemind", ServicesStack, BlueMindWebsiteScreen, "BlueMind")}
124
+            {getWebsiteStack("ent", ServicesStack, ENTWebsiteScreen, i18n.t('screens.ent'))}
125
+            {getWebsiteStack("bluemind", ServicesStack, BlueMindWebsiteScreen, i18n.t('screens.bluemind'))}
126 126
 
127 127
 
128 128
             {/*     AMICALE     */}

+ 18
- 23
src/screens/Services/ServicesScreen.js View File

@@ -11,6 +11,7 @@ import {Animated, View} from "react-native";
11 11
 import {Avatar, Button, Card, Divider, List, Title, TouchableRipple, withTheme} from "react-native-paper";
12 12
 import type {CustomTheme} from "../../managers/ThemeManager";
13 13
 import ConnectionManager from "../../managers/ConnectionManager";
14
+import i18n from 'i18n-js';
14 15
 
15 16
 type Props = {
16 17
     navigation: Object,
@@ -55,31 +56,25 @@ class ServicesScreen extends React.Component<Props, State> {
55 56
         const nav = props.navigation;
56 57
         this.amicaleDataset = [
57 58
             {
58
-                title: "AMICALE",
59
-                subtitle: "AMICALE",
60
-                image: AMICALE_IMAGE,
61
-                onPress: () => nav.navigate("amicale-website"),
62
-            },
63
-            {
64
-                title: "CLUBS",
59
+                title: i18n.t('screens.clubsAbout'),
65 60
                 subtitle: "CLUB LIST",
66 61
                 image: AMICALE_IMAGE,
67 62
                 onPress: () => nav.navigate("club-list"),
68 63
             },
69 64
             {
70
-                title: "PROFIL",
65
+                title: i18n.t('screens.profile'),
71 66
                 subtitle: "PROFIL",
72 67
                 image: AMICALE_IMAGE,
73 68
                 onPress: () => nav.navigate("profile"),
74 69
             },
75 70
             {
76
-                title: "CONTACT",
71
+                title: i18n.t('screens.amicaleAbout'),
77 72
                 subtitle: "CONTACT",
78 73
                 image: AMICALE_IMAGE,
79 74
                 onPress: () => nav.navigate("amicale-contact"),
80 75
             },
81 76
             {
82
-                title: "ELECTIONS",
77
+                title: i18n.t('screens.vote'),
83 78
                 subtitle: "ELECTIONS",
84 79
                 image: AMICALE_IMAGE,
85 80
                 onPress: () => nav.navigate("vote"),
@@ -87,31 +82,31 @@ class ServicesScreen extends React.Component<Props, State> {
87 82
         ];
88 83
         this.studentsDataset = [
89 84
             {
90
-                title: "proximo",
85
+                title: i18n.t('screens.proximo'),
91 86
                 subtitle: "proximo",
92 87
                 image: PROXIMO_IMAGE,
93 88
                 onPress: () => nav.navigate("proximo"),
94 89
             },
95 90
             {
96
-                title: "AMICALE",
91
+                title: i18n.t('screens.amicaleWebsite'),
97 92
                 subtitle: "AMICALE",
98 93
                 image: AMICALE_IMAGE,
99 94
                 onPress: () => nav.navigate("amicale-website"),
100 95
             },
101 96
             {
102
-                title: "wiketud",
97
+                title: "Wiketud",
103 98
                 subtitle: "wiketud",
104 99
                 image: WIKETUD_LINK,
105 100
                 onPress: () => nav.navigate("wiketud"),
106 101
             },
107 102
             {
108
-                title: "ELUS ETUDIANTS",
103
+                title: "Élus Étudiants",
109 104
                 subtitle: "ELUS ETUDIANTS",
110 105
                 image: EE_IMAGE,
111 106
                 onPress: () => nav.navigate("elus-etudiants"),
112 107
             },
113 108
             {
114
-                title: "TUTOR INSA",
109
+                title: "Tutor'INSA",
115 110
                 subtitle: "TUTOR INSA",
116 111
                 image: TUTORINSA_IMAGE,
117 112
                 onPress: () => nav.navigate("tutorinsa"),
@@ -119,31 +114,31 @@ class ServicesScreen extends React.Component<Props, State> {
119 114
         ];
120 115
         this.insaDataset = [
121 116
             {
122
-                title: "RU",
117
+                title: i18n.t('screens.menuSelf'),
123 118
                 subtitle: "the ru",
124 119
                 image: RU_IMAGE,
125 120
                 onPress: () => nav.navigate("self-menu"),
126 121
             },
127 122
             {
128
-                title: "AVAILABLE ROOMS",
123
+                title: i18n.t('screens.availableRooms'),
129 124
                 subtitle: "ROOMS",
130 125
                 image: ROOM_IMAGE,
131 126
                 onPress: () => nav.navigate("available-rooms"),
132 127
             },
133 128
             {
134
-                title: "BIB",
129
+                title: i18n.t('screens.bib'),
135 130
                 subtitle: "BIB",
136 131
                 image: BIB_IMAGE,
137 132
                 onPress: () => nav.navigate("bib"),
138 133
             },
139 134
             {
140
-                title: "EMAIL",
135
+                title: i18n.t('screens.bluemind'),
141 136
                 subtitle: "EMAIL",
142 137
                 image: EMAIL_IMAGE,
143 138
                 onPress: () => nav.navigate("bluemind"),
144 139
             },
145 140
             {
146
-                title: "ENT",
141
+                title: i18n.t('screens.ent'),
147 142
                 subtitle: "ENT",
148 143
                 image: ENT_IMAGE,
149 144
                 onPress: () => nav.navigate("ent"),
@@ -151,21 +146,21 @@ class ServicesScreen extends React.Component<Props, State> {
151 146
         ];
152 147
         this.finalDataset = [
153 148
             {
154
-                title: "AMICALE",
149
+                title: i18n.t("servicesScreen.amicale"),
155 150
                 description: "LOGIN",
156 151
                 image: AMICALE_IMAGE,
157 152
                 shouldLogin: true,
158 153
                 content: this.amicaleDataset
159 154
             },
160 155
             {
161
-                title: "STUDENTS",
156
+                title: i18n.t("servicesScreen.students"),
162 157
                 description: "SERVICES OFFERED BY STUDENTS",
163 158
                 image: 'account-group',
164 159
                 shouldLogin: false,
165 160
                 content: this.studentsDataset
166 161
             },
167 162
             {
168
-                title: "INSA",
163
+                title: i18n.t("servicesScreen.insa"),
169 164
                 description: "SERVICES OFFERED BY INSA",
170 165
                 image: 'school',
171 166
                 shouldLogin: false,

+ 21
- 32
translations/en.json View File

@@ -6,7 +6,8 @@
6 6
     "clubDisplayScreen": "Club details",
7 7
     "feedDisplayScreen": "Details",
8 8
     "clubsAbout": "Clubs",
9
-    "amicaleAbout": "The Amicale",
9
+    "amicaleAbout": "Contact",
10
+    "amicaleWebsite": "Amicale's website",
10 11
     "proxiwash": "Proxiwash",
11 12
     "services": "Services",
12 13
     "proximo": "Proximo",
@@ -96,28 +97,11 @@
96 97
       "todayEventsSubtitleNA": "No events today",
97 98
       "todayEventsSubtitle": " event coming today",
98 99
       "todayEventsSubtitlePlural": " events coming today",
99
-      "proximoTitle": "Proximo",
100
-      "proximoSubtitleNA": "No articles available",
101
-      "proximoSubtitle": " article available",
102
-      "proximoSubtitlePlural": " articles available",
103
-      "tutorinsaSubtitleNA": "No tutorial available",
104
-      "tutorinsaSubtitle": " tutorial available",
105
-      "tutorinsaSubtitlePlural": " tutorials available",
106
-      "proxiwashTitle": "Available machines",
107
-      "proxiwashSubtitleNA": "No machines available",
108
-      "proxiwashSubtitle1": " dryer",
109
-      "proxiwashSubtitle1Plural": " dryers",
110
-      "proxiwashSubtitle2": " washer",
111
-      "proxiwashSubtitle2Plural": " washers",
112
-      "menuTitle": "Today's menu",
113
-      "menuSubtitleNA": "No menu available",
114
-      "menuSubtitle": "Click here to see the menu"
100
+      "amicaleTitle": "The Amicale",
101
+      "amicaleConnect": "Login",
102
+      "amicaleConnected": "See available services"
115 103
     }
116 104
   },
117
-  "planningScreen": {
118
-    "wipTitle": "WORK IN PROGRESS",
119
-    "wipSubtitle": "Soon, every event at the INSA Toulouse in one place !"
120
-  },
121 105
   "aboutScreen": {
122 106
     "appstore": "See on the Appstore",
123 107
     "playstore": "See on the Playstore",
@@ -294,7 +278,7 @@
294 278
       "animation": "Animation",
295 279
       "clubs": "Clubs",
296 280
       "event": "Events",
297
-      "tech" : "Technique",
281
+      "tech": "Technique",
298 282
       "communication": "Communication",
299 283
       "intraSchools": "Alumni / IAT",
300 284
       "publicRelations": "Public Relations"
@@ -312,28 +296,28 @@
312 296
     "tease": {
313 297
       "title": "Elections incoming",
314 298
       "subtitle": "Be ready to vote!",
315
-      "message" : "Vote start:"
299
+      "message": "Vote start:"
316 300
     },
317 301
     "wait": {
318 302
       "titleSubmitted": "Vote submitted!",
319 303
       "titleEnded": "Votes closed",
320
-      "subtitle" : "Waiting for results...",
321
-      "messageSubmitted" : "Vote submitted successfully.",
322
-      "messageVoted" : "Thank you for your participation.",
323
-      "messageDate" : "Results available:",
324
-      "messageDateUndefined" : "Results will be available shortly"
304
+      "subtitle": "Waiting for results...",
305
+      "messageSubmitted": "Vote submitted successfully.",
306
+      "messageVoted": "Thank you for your participation.",
307
+      "messageDate": "Results available:",
308
+      "messageDateUndefined": "Results will be available shortly"
325 309
     },
326 310
     "results": {
327 311
       "title": "Results",
328 312
       "subtitle": "Available until:",
329
-      "totalVotes" : "Total votes:",
330
-      "votes" : "votes"
313
+      "totalVotes": "Total votes:",
314
+      "votes": "votes"
331 315
     },
332 316
     "title": {
333 317
       "title": "The Elections",
334 318
       "subtitle": "Why your vote is important",
335
-      "paragraph1" : "The Amicale's elections is the right moment for you to choose the next team, which will handle different projects on the campus, help organizing your favorite events, animate the campus life during the whole year, and relay your ideas to the administration, so that your campus life is the most enjoyable possible!\nYour turn to make a change!\uD83D\uDE09",
336
-      "paragraph2" : "Note: If there is only one list, it is still important to vote to show your support, so that the administration knows the current list is supported by students. It is always a plus when taking difficult decisions! \uD83D\uDE09"
319
+      "paragraph1": "The Amicale's elections is the right moment for you to choose the next team, which will handle different projects on the campus, help organizing your favorite events, animate the campus life during the whole year, and relay your ideas to the administration, so that your campus life is the most enjoyable possible!\nYour turn to make a change!\uD83D\uDE09",
320
+      "paragraph2": "Note: If there is only one list, it is still important to vote to show your support, so that the administration knows the current list is supported by students. It is always a plus when taking difficult decisions! \uD83D\uDE09"
337 321
     }
338 322
   },
339 323
   "dialog": {
@@ -398,5 +382,10 @@
398 382
       "time": "Time: ",
399 383
       "exit": "leave Game"
400 384
     }
385
+  },
386
+  "servicesScreen": {
387
+    "amicale": "The Amicale",
388
+    "students": "Student services",
389
+    "insa": "INSA services"
401 390
   }
402 391
 }

+ 21
- 32
translations/fr.json View File

@@ -6,7 +6,8 @@
6 6
     "clubDisplayScreen": "Détails",
7 7
     "feedDisplayScreen": "Détails",
8 8
     "clubsAbout": "Les Clubs",
9
-    "amicaleAbout": "L' Amicale",
9
+    "amicaleAbout": "Contact",
10
+    "amicaleWebsite": "Site de l'Amicale",
10 11
     "proxiwash": "Proxiwash",
11 12
     "services": "Services",
12 13
     "proximo": "Proximo",
@@ -96,28 +97,11 @@
96 97
       "todayEventsSubtitleNA": "Pas d'événement",
97 98
       "todayEventsSubtitle": " événement aujourd'hui",
98 99
       "todayEventsSubtitlePlural": " événements aujourd'hui",
99
-      "proximoTitle": "Proximo",
100
-      "proximoSubtitleNA": "pas d'article en vente",
101
-      "proximoSubtitle": " article disponible",
102
-      "proximoSubtitlePlural": " articles disponibles",
103
-      "tutorinsaSubtitleNA": "Aucun tutorat disponible",
104
-      "tutorinsaSubtitle": " tutorat disponible",
105
-      "tutorinsaSubtitlePlural": " tutorats disponibles",
106
-      "proxiwashTitle": "Machines disponibles",
107
-      "proxiwashSubtitleNA": "Pas de machine disponible",
108
-      "proxiwashSubtitle1": " sèche-linge",
109
-      "proxiwashSubtitle1Plural": " sèche-linges",
110
-      "proxiwashSubtitle2": " lave-linge",
111
-      "proxiwashSubtitle2Plural": " lave-linges",
112
-      "menuTitle": "Menu d'aujourd'hui",
113
-      "menuSubtitleNA": "Pas de menu disponible",
114
-      "menuSubtitle": "Cliquez ici pour voir le menu"
100
+      "amicaleTitle": "L'Amicale",
101
+      "amicaleConnect": "Se connecter",
102
+      "amicaleConnected": "Voir les services disponibles"
115 103
     }
116 104
   },
117
-  "planningScreen": {
118
-    "wipTitle": "WORK IN PROGRESS",
119
-    "wipSubtitle": "Bientôt, tous les évènements de l'INSA Toulouse en un seul endroit !"
120
-  },
121 105
   "aboutScreen": {
122 106
     "appstore": "Voir sur l'Appstore",
123 107
     "playstore": "Voir sur le Playstore",
@@ -294,7 +278,7 @@
294 278
       "animation": "Animation",
295 279
       "clubs": "Clubs",
296 280
       "event": "Événements",
297
-      "tech" : "Technique",
281
+      "tech": "Technique",
298 282
       "communication": "Communication",
299 283
       "intraSchools": "Alumni / IAT",
300 284
       "publicRelations": "Relations Publiques"
@@ -312,28 +296,28 @@
312 296
     "tease": {
313 297
       "title": "Les élections arrivent",
314 298
       "subtitle": "Préparez vous à voter !",
315
-      "message" : "Début des votes :"
299
+      "message": "Début des votes :"
316 300
     },
317 301
     "wait": {
318 302
       "titleSubmitted": "Vote envoyé !",
319 303
       "titleEnded": "Votes fermés",
320
-      "subtitle" : "Attente des résultats...",
321
-      "messageSubmitted" : "Votre vote a bien été envoyé.",
322
-      "messageVoted" : "Merci pour votre participation.",
323
-      "messageDate" : "Disponibilité des résultats :",
324
-      "messageDateUndefined" : "les résultats seront disponibles sous peu."
304
+      "subtitle": "Attente des résultats...",
305
+      "messageSubmitted": "Votre vote a bien été envoyé.",
306
+      "messageVoted": "Merci pour votre participation.",
307
+      "messageDate": "Disponibilité des résultats :",
308
+      "messageDateUndefined": "les résultats seront disponibles sous peu."
325 309
     },
326 310
     "results": {
327 311
       "title": "Résultats",
328 312
       "subtitle": "Disponibles jusqu'à :",
329
-      "totalVotes" : "Nombre total de votes :",
330
-      "votes" : "votes"
313
+      "totalVotes": "Nombre total de votes :",
314
+      "votes": "votes"
331 315
     },
332 316
     "title": {
333 317
       "title": "Les Élections",
334 318
       "subtitle": "Pourquoi votre vote est important",
335
-      "paragraph1" : "Les élections de l'amicale, c'est le moment pour vous de choisir la prochaine équipe qui portera les différents projets du campus, qui soutiendra les organisations de vos événements favoris, qui vous proposera des animations tout au long de l'année, et qui poussera vos idées à l’administration pour que la vie de campus soit des plus riches !\nAlors à vous de jouer ! \uD83D\uDE09",
336
-      "paragraph2" : "NB : Si par cas il n'y a qu'une liste qui se présente, il est important que tout le monde vote, afin qui la liste puisse montrer à l’administration que les INSAiens la soutiennent ! Ça compte toujours pour les décisions difficiles ! \uD83D\uDE09"
319
+      "paragraph1": "Les élections de l'amicale, c'est le moment pour vous de choisir la prochaine équipe qui portera les différents projets du campus, qui soutiendra les organisations de vos événements favoris, qui vous proposera des animations tout au long de l'année, et qui poussera vos idées à l’administration pour que la vie de campus soit des plus riches !\nAlors à vous de jouer ! \uD83D\uDE09",
320
+      "paragraph2": "NB : Si par cas il n'y a qu'une liste qui se présente, il est important que tout le monde vote, afin qui la liste puisse montrer à l’administration que les INSAiens la soutiennent ! Ça compte toujours pour les décisions difficiles ! \uD83D\uDE09"
337 321
     }
338 322
   },
339 323
   "dialog": {
@@ -398,5 +382,10 @@
398 382
       "time": "Temps: ",
399 383
       "exit": "Quitter"
400 384
     }
385
+  },
386
+  "servicesScreen": {
387
+    "amicale": "L'Amicale",
388
+    "students": "Services étudiants",
389
+    "insa": "Services de l'INSA"
401 390
   }
402 391
 }

Loading…
Cancel
Save