Skip to content

Commit 7a51431

Browse files
author
Doris Tam
committed
VC 45 ... compiling lang strings
1 parent 3c30f25 commit 7a51431

File tree

9 files changed

+93
-77
lines changed

9 files changed

+93
-77
lines changed

‎MaharaMobile/android/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ android {
134134
applicationId "org.mahara.mobile.app"
135135
minSdkVersion rootProject.ext.minSdkVersion
136136
targetSdkVersion rootProject.ext.targetSdkVersion
137-
versionCode 43
137+
versionCode 45
138138
versionName "21.10.0"
139139
ndk { debugSymbolLevel 'FULL' }
140140
}

‎MaharaMobile/locales/en/messages.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MaharaMobile/locales/en/messages.po

+22-18
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ msgstr ""
6363
#~ msgid "Add {0}"
6464
#~ msgstr ""
6565

66-
#: src/screens/PendingScreen/PendingScreen.tsx:68
66+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:48
6767
msgid "Added to upload queue successfully!"
6868
msgstr ""
6969

@@ -112,7 +112,7 @@ msgstr ""
112112
msgid "App version"
113113
msgstr ""
114114

115-
#: src/screens/PendingScreen/PendingScreen.tsx:75
115+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:55
116116
#: src/utils/addEditHelperFunctions.tsx:82
117117
#: src/utils/authHelperFunctions.ts:102
118118
msgid "Are you sure?"
@@ -141,7 +141,7 @@ msgstr ""
141141
#~ msgstr ""
142142

143143
#: src/components/UI/CancelButton/CancelButton.tsx:12
144-
#: src/screens/PendingScreen/PendingScreen.tsx:77
144+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:57
145145
#: src/utils/addEditHelperFunctions.tsx:84
146146
msgid "Cancel"
147147
msgstr ""
@@ -175,7 +175,7 @@ msgstr ""
175175
msgid "Default options"
176176
msgstr ""
177177

178-
#: src/screens/PendingScreen/PendingScreen.tsx:82
178+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:62
179179
msgid "Delete"
180180
msgstr ""
181181

@@ -225,7 +225,7 @@ msgstr ""
225225
msgid "File"
226226
msgstr ""
227227

228-
#: src/screens/PendingScreen/PendingScreen.tsx:149
228+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:129
229229
msgid "Files have been uploaded to your Mahara successfully!"
230230
msgstr ""
231231

@@ -296,7 +296,7 @@ msgstr ""
296296
msgid "Invalid file"
297297
msgstr ""
298298

299-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:102
299+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:112
300300
msgid "Invalid token: please try again."
301301
msgstr ""
302302

@@ -347,13 +347,17 @@ msgstr ""
347347
msgid "Log in via username and password"
348348
msgstr ""
349349

350+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:87
351+
msgid "Logged in: {0}"
352+
msgstr ""
353+
350354
#: src/components/LocalLogin/LocalLogin.tsx:80
351355
msgid "Login"
352356
msgstr ""
353357

354-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:99
355-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:102
356-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:105
358+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:109
359+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:112
360+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:115
357361
msgid "Login failed"
358362
msgstr ""
359363

@@ -471,7 +475,7 @@ msgstr ""
471475
msgid "Please enter a URL."
472476
msgstr ""
473477

474-
#: src/screens/PendingScreen/PendingScreen.tsx:197
478+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:177
475479
msgid "Please login"
476480
msgstr ""
477481

@@ -483,7 +487,7 @@ msgstr ""
483487
msgid "Please select a journal"
484488
msgstr ""
485489

486-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:105
490+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:115
487491
msgid "Please try again."
488492
msgstr ""
489493

@@ -606,7 +610,7 @@ msgstr ""
606610
msgid "The Privacy Statement"
607611
msgstr ""
608612

609-
#: src/screens/PendingScreen/PendingScreen.tsx:75
613+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:55
610614
msgid "The deletion of this information or file cannot be undone"
611615
msgstr ""
612616

@@ -659,7 +663,7 @@ msgstr ""
659663
msgid "To the maximum extent permitted by law, we will not be liable to you for any direct, indirect or consequential loss or damages (including but not limited to loss of business profits, business interruption, loss of business information, data, goodwill or other non-pecuniary loss) arising out of or in connection with this agreement or the provision of the website, whether arising from negligence, breach of contract or otherwise."
660664
msgstr ""
661665

662-
#: src/screens/PendingScreen/PendingScreen.tsx:197
666+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:177
663667
msgid "To upload pending items"
664668
msgstr ""
665669

@@ -679,7 +683,7 @@ msgstr ""
679683
msgid "Upload queue page"
680684
msgstr ""
681685

682-
#: src/screens/PendingScreen/PendingScreen.tsx:196
686+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:176
683687
msgid "Upload to your site"
684688
msgstr ""
685689

@@ -763,15 +767,15 @@ msgstr ""
763767
msgid "Your own name is displayed in the app once you are logged in, and you are connected to your Mahara account via an access token that is stored in the app as well as on Mahara itself so the two can communicate with each other."
764768
msgstr ""
765769

766-
#: src/screens/PendingScreen/PendingScreen.tsx:194
770+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:174
767771
msgid "Your site: {url}"
768772
msgstr ""
769773

770-
#: src/screens/PendingScreen/PendingScreen.tsx:134
774+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:114
771775
msgid "Your upload queue is empty"
772776
msgstr ""
773777

774-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:99
778+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:109
775779
msgid "Your username or password was incorrect. Please try again."
776780
msgstr ""
777781

@@ -830,6 +834,6 @@ msgstr ""
830834
#~ msgid "{0}"
831835
#~ msgstr ""
832836

833-
#: src/screens/PendingScreen/PendingScreen.tsx:102
837+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:82
834838
msgid "{errorMessage}"
835839
msgstr ""

‎MaharaMobile/locales/es/messages.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MaharaMobile/locales/es/messages.po

+22-18
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ msgstr ""
4949
msgid "Add new tag +"
5050
msgstr ""
5151

52-
#: src/screens/PendingScreen/PendingScreen.tsx:68
52+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:48
5353
msgid "Added to upload queue successfully!"
5454
msgstr ""
5555

@@ -90,7 +90,7 @@ msgstr ""
9090
msgid "App version"
9191
msgstr ""
9292

93-
#: src/screens/PendingScreen/PendingScreen.tsx:75
93+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:55
9494
#: src/utils/addEditHelperFunctions.tsx:82
9595
#: src/utils/authHelperFunctions.ts:102
9696
msgid "Are you sure?"
@@ -115,7 +115,7 @@ msgstr ""
115115
#~ msgstr ""
116116

117117
#: src/components/UI/CancelButton/CancelButton.tsx:12
118-
#: src/screens/PendingScreen/PendingScreen.tsx:77
118+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:57
119119
#: src/utils/addEditHelperFunctions.tsx:84
120120
msgid "Cancel"
121121
msgstr ""
@@ -145,7 +145,7 @@ msgstr ""
145145
msgid "Default options"
146146
msgstr ""
147147

148-
#: src/screens/PendingScreen/PendingScreen.tsx:82
148+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:62
149149
msgid "Delete"
150150
msgstr ""
151151

@@ -195,7 +195,7 @@ msgstr ""
195195
msgid "File"
196196
msgstr ""
197197

198-
#: src/screens/PendingScreen/PendingScreen.tsx:149
198+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:129
199199
msgid "Files have been uploaded to your Mahara successfully!"
200200
msgstr ""
201201

@@ -258,7 +258,7 @@ msgstr ""
258258
msgid "Invalid file"
259259
msgstr ""
260260

261-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:102
261+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:112
262262
msgid "Invalid token: please try again."
263263
msgstr ""
264264

@@ -300,13 +300,17 @@ msgstr ""
300300
msgid "Log in via username and password"
301301
msgstr ""
302302

303+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:87
304+
msgid "Logged in: {0}"
305+
msgstr ""
306+
303307
#: src/components/LocalLogin/LocalLogin.tsx:80
304308
msgid "Login"
305309
msgstr ""
306310

307-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:99
308-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:102
309-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:105
311+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:109
312+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:112
313+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:115
310314
msgid "Login failed"
311315
msgstr ""
312316

@@ -404,7 +408,7 @@ msgstr ""
404408
msgid "Please enter a URL."
405409
msgstr ""
406410

407-
#: src/screens/PendingScreen/PendingScreen.tsx:197
411+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:177
408412
msgid "Please login"
409413
msgstr ""
410414

@@ -416,7 +420,7 @@ msgstr ""
416420
msgid "Please select a journal"
417421
msgstr ""
418422

419-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:105
423+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:115
420424
msgid "Please try again."
421425
msgstr ""
422426

@@ -539,7 +543,7 @@ msgstr ""
539543
msgid "The Privacy Statement"
540544
msgstr ""
541545

542-
#: src/screens/PendingScreen/PendingScreen.tsx:75
546+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:55
543547
msgid "The deletion of this information or file cannot be undone"
544548
msgstr ""
545549

@@ -592,7 +596,7 @@ msgstr ""
592596
msgid "To the maximum extent permitted by law, we will not be liable to you for any direct, indirect or consequential loss or damages (including but not limited to loss of business profits, business interruption, loss of business information, data, goodwill or other non-pecuniary loss) arising out of or in connection with this agreement or the provision of the website, whether arising from negligence, breach of contract or otherwise."
593597
msgstr ""
594598

595-
#: src/screens/PendingScreen/PendingScreen.tsx:197
599+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:177
596600
msgid "To upload pending items"
597601
msgstr ""
598602

@@ -612,7 +616,7 @@ msgstr ""
612616
msgid "Upload queue page"
613617
msgstr ""
614618

615-
#: src/screens/PendingScreen/PendingScreen.tsx:196
619+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:176
616620
msgid "Upload to your site"
617621
msgstr ""
618622

@@ -680,15 +684,15 @@ msgstr ""
680684
msgid "Your own name is displayed in the app once you are logged in, and you are connected to your Mahara account via an access token that is stored in the app as well as on Mahara itself so the two can communicate with each other."
681685
msgstr ""
682686

683-
#: src/screens/PendingScreen/PendingScreen.tsx:194
687+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:174
684688
msgid "Your site: {url}"
685689
msgstr ""
686690

687-
#: src/screens/PendingScreen/PendingScreen.tsx:134
691+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:114
688692
msgid "Your upload queue is empty"
689693
msgstr ""
690694

691-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:99
695+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:109
692696
msgid "Your username or password was incorrect. Please try again."
693697
msgstr ""
694698

@@ -731,6 +735,6 @@ msgstr ""
731735
msgid "repository on GitHub."
732736
msgstr ""
733737

734-
#: src/screens/PendingScreen/PendingScreen.tsx:102
738+
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:82
735739
msgid "{errorMessage}"
736740
msgstr ""

‎MaharaMobile/locales/ko/messages.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)