Skip to content

Commit 8f33369

Browse files
author
Doris Tam
committed
VC 46 - compiling strings
Revert a refactor change - cannot locate error
1 parent b1150db commit 8f33369

File tree

5 files changed

+77
-77
lines changed

5 files changed

+77
-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 45
137+
versionCode 46
138138
versionName "21.10.0"
139139
ndk { debugSymbolLevel 'FULL' }
140140
}

‎MaharaMobile/locales/en/messages.po

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

66-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:48
66+
#: src/screens/PendingScreen/PendingScreen.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/UploadQueueScreen/UploadQueueScreen.tsx:55
115+
#: src/screens/PendingScreen/PendingScreen.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/UploadQueueScreen/UploadQueueScreen.tsx:57
144+
#: src/screens/PendingScreen/PendingScreen.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/UploadQueueScreen/UploadQueueScreen.tsx:62
178+
#: src/screens/PendingScreen/PendingScreen.tsx:62
179179
msgid "Delete"
180180
msgstr ""
181181

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

228-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:129
228+
#: src/screens/PendingScreen/PendingScreen.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:112
299+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:110
300300
msgid "Invalid token: please try again."
301301
msgstr ""
302302

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

350-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:87
350+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:85
351351
msgid "Logged in: {0}"
352352
msgstr ""
353353

354354
#: src/components/LocalLogin/LocalLogin.tsx:80
355355
msgid "Login"
356356
msgstr ""
357357

358-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:109
359-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:112
360-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:115
358+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:107
359+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:110
360+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:113
361361
msgid "Login failed"
362362
msgstr ""
363363

@@ -475,7 +475,7 @@ msgstr ""
475475
msgid "Please enter a URL."
476476
msgstr ""
477477

478-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:177
478+
#: src/screens/PendingScreen/PendingScreen.tsx:177
479479
msgid "Please login"
480480
msgstr ""
481481

@@ -487,7 +487,7 @@ msgstr ""
487487
msgid "Please select a journal"
488488
msgstr ""
489489

490-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:115
490+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:113
491491
msgid "Please try again."
492492
msgstr ""
493493

@@ -610,7 +610,7 @@ msgstr ""
610610
msgid "The Privacy Statement"
611611
msgstr ""
612612

613-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:55
613+
#: src/screens/PendingScreen/PendingScreen.tsx:55
614614
msgid "The deletion of this information or file cannot be undone"
615615
msgstr ""
616616

@@ -663,7 +663,7 @@ msgstr ""
663663
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."
664664
msgstr ""
665665

666-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:177
666+
#: src/screens/PendingScreen/PendingScreen.tsx:177
667667
msgid "To upload pending items"
668668
msgstr ""
669669

@@ -683,7 +683,7 @@ msgstr ""
683683
msgid "Upload queue page"
684684
msgstr ""
685685

686-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:176
686+
#: src/screens/PendingScreen/PendingScreen.tsx:176
687687
msgid "Upload to your site"
688688
msgstr ""
689689

@@ -767,15 +767,15 @@ msgstr ""
767767
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."
768768
msgstr ""
769769

770-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:174
770+
#: src/screens/PendingScreen/PendingScreen.tsx:174
771771
msgid "Your site: {url}"
772772
msgstr ""
773773

774-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:114
774+
#: src/screens/PendingScreen/PendingScreen.tsx:114
775775
msgid "Your upload queue is empty"
776776
msgstr ""
777777

778-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:109
778+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:107
779779
msgid "Your username or password was incorrect. Please try again."
780780
msgstr ""
781781

@@ -834,6 +834,6 @@ msgstr ""
834834
#~ msgid "{0}"
835835
#~ msgstr ""
836836

837-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:82
837+
#: src/screens/PendingScreen/PendingScreen.tsx:82
838838
msgid "{errorMessage}"
839839
msgstr ""

‎MaharaMobile/locales/es/messages.po

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

52-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:48
52+
#: src/screens/PendingScreen/PendingScreen.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/UploadQueueScreen/UploadQueueScreen.tsx:55
93+
#: src/screens/PendingScreen/PendingScreen.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/UploadQueueScreen/UploadQueueScreen.tsx:57
118+
#: src/screens/PendingScreen/PendingScreen.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/UploadQueueScreen/UploadQueueScreen.tsx:62
148+
#: src/screens/PendingScreen/PendingScreen.tsx:62
149149
msgid "Delete"
150150
msgstr ""
151151

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

198-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:129
198+
#: src/screens/PendingScreen/PendingScreen.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:112
261+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:110
262262
msgid "Invalid token: please try again."
263263
msgstr ""
264264

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

303-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:87
303+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:85
304304
msgid "Logged in: {0}"
305305
msgstr ""
306306

307307
#: src/components/LocalLogin/LocalLogin.tsx:80
308308
msgid "Login"
309309
msgstr ""
310310

311-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:109
312-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:112
313-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:115
311+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:107
312+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:110
313+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:113
314314
msgid "Login failed"
315315
msgstr ""
316316

@@ -408,7 +408,7 @@ msgstr ""
408408
msgid "Please enter a URL."
409409
msgstr ""
410410

411-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:177
411+
#: src/screens/PendingScreen/PendingScreen.tsx:177
412412
msgid "Please login"
413413
msgstr ""
414414

@@ -420,7 +420,7 @@ msgstr ""
420420
msgid "Please select a journal"
421421
msgstr ""
422422

423-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:115
423+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:113
424424
msgid "Please try again."
425425
msgstr ""
426426

@@ -543,7 +543,7 @@ msgstr ""
543543
msgid "The Privacy Statement"
544544
msgstr ""
545545

546-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:55
546+
#: src/screens/PendingScreen/PendingScreen.tsx:55
547547
msgid "The deletion of this information or file cannot be undone"
548548
msgstr ""
549549

@@ -596,7 +596,7 @@ msgstr ""
596596
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."
597597
msgstr ""
598598

599-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:177
599+
#: src/screens/PendingScreen/PendingScreen.tsx:177
600600
msgid "To upload pending items"
601601
msgstr ""
602602

@@ -616,7 +616,7 @@ msgstr ""
616616
msgid "Upload queue page"
617617
msgstr ""
618618

619-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:176
619+
#: src/screens/PendingScreen/PendingScreen.tsx:176
620620
msgid "Upload to your site"
621621
msgstr ""
622622

@@ -684,15 +684,15 @@ msgstr ""
684684
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."
685685
msgstr ""
686686

687-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:174
687+
#: src/screens/PendingScreen/PendingScreen.tsx:174
688688
msgid "Your site: {url}"
689689
msgstr ""
690690

691-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:114
691+
#: src/screens/PendingScreen/PendingScreen.tsx:114
692692
msgid "Your upload queue is empty"
693693
msgstr ""
694694

695-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:109
695+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:107
696696
msgid "Your username or password was incorrect. Please try again."
697697
msgstr ""
698698

@@ -735,6 +735,6 @@ msgstr ""
735735
msgid "repository on GitHub."
736736
msgstr ""
737737

738-
#: src/screens/UploadQueueScreen/UploadQueueScreen.tsx:82
738+
#: src/screens/PendingScreen/PendingScreen.tsx:82
739739
msgid "{errorMessage}"
740740
msgstr ""

0 commit comments

Comments
 (0)