Skip to content

Commit c3335ef

Browse files
author
Doris Tam
committed
VC 47 ... compile strings + add loading icon for logins
1 parent 8f33369 commit c3335ef

File tree

17 files changed

+86
-68
lines changed

17 files changed

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

‎MaharaMobile/locales/en/messages.po

+11-11
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ msgstr ""
296296
msgid "Invalid file"
297297
msgstr ""
298298

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

@@ -339,25 +339,25 @@ msgstr ""
339339
msgid "Local"
340340
msgstr ""
341341

342-
#: src/components/TokenInput/TokenInput.tsx:24
342+
#: src/components/TokenInput/TokenInput.tsx:25
343343
msgid "Log in via an access token"
344344
msgstr ""
345345

346-
#: src/components/LocalLogin/LocalLogin.tsx:72
346+
#: src/components/LocalLogin/LocalLogin.tsx:74
347347
msgid "Log in via username and password"
348348
msgstr ""
349349

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

354-
#: src/components/LocalLogin/LocalLogin.tsx:80
354+
#: src/components/LocalLogin/LocalLogin.tsx:82
355355
msgid "Login"
356356
msgstr ""
357357

358-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:107
359358
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:110
360359
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:113
360+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:116
361361
msgid "Login failed"
362362
msgstr ""
363363

@@ -453,7 +453,7 @@ msgstr ""
453453
msgid "Our obligations"
454454
msgstr ""
455455

456-
#: src/components/LocalLogin/LocalLogin.tsx:78
456+
#: src/components/LocalLogin/LocalLogin.tsx:80
457457
msgid "Password"
458458
msgstr ""
459459

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

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

@@ -687,11 +687,11 @@ msgstr ""
687687
msgid "Upload to your site"
688688
msgstr ""
689689

690-
#: src/components/LocalLogin/LocalLogin.tsx:75
690+
#: src/components/LocalLogin/LocalLogin.tsx:77
691691
msgid "Username"
692692
msgstr ""
693693

694-
#: src/components/TokenInput/TokenInput.tsx:26
694+
#: src/components/TokenInput/TokenInput.tsx:27
695695
msgid "Verify token"
696696
msgstr ""
697697

@@ -775,7 +775,7 @@ msgstr ""
775775
msgid "Your upload queue is empty"
776776
msgstr ""
777777

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

‎MaharaMobile/locales/es/messages.po

+11-11
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ msgstr ""
258258
msgid "Invalid file"
259259
msgstr ""
260260

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

@@ -292,25 +292,25 @@ msgstr ""
292292
msgid "Local"
293293
msgstr ""
294294

295-
#: src/components/TokenInput/TokenInput.tsx:24
295+
#: src/components/TokenInput/TokenInput.tsx:25
296296
msgid "Log in via an access token"
297297
msgstr ""
298298

299-
#: src/components/LocalLogin/LocalLogin.tsx:72
299+
#: src/components/LocalLogin/LocalLogin.tsx:74
300300
msgid "Log in via username and password"
301301
msgstr ""
302302

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

307-
#: src/components/LocalLogin/LocalLogin.tsx:80
307+
#: src/components/LocalLogin/LocalLogin.tsx:82
308308
msgid "Login"
309309
msgstr ""
310310

311-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:107
312311
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:110
313312
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:113
313+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:116
314314
msgid "Login failed"
315315
msgstr ""
316316

@@ -386,7 +386,7 @@ msgstr ""
386386
msgid "Our obligations"
387387
msgstr ""
388388

389-
#: src/components/LocalLogin/LocalLogin.tsx:78
389+
#: src/components/LocalLogin/LocalLogin.tsx:80
390390
msgid "Password"
391391
msgstr ""
392392

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

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

@@ -620,11 +620,11 @@ msgstr ""
620620
msgid "Upload to your site"
621621
msgstr ""
622622

623-
#: src/components/LocalLogin/LocalLogin.tsx:75
623+
#: src/components/LocalLogin/LocalLogin.tsx:77
624624
msgid "Username"
625625
msgstr ""
626626

627-
#: src/components/TokenInput/TokenInput.tsx:26
627+
#: src/components/TokenInput/TokenInput.tsx:27
628628
msgid "Verify token"
629629
msgstr ""
630630

@@ -692,7 +692,7 @@ msgstr ""
692692
msgid "Your upload queue is empty"
693693
msgstr ""
694694

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

‎MaharaMobile/locales/ko/messages.po

+11-11
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ msgstr "잘못된 Mahara 사이트입니다. URL을 다시 입력하십시오."
290290
msgid "Invalid file"
291291
msgstr "유효하지 않은 파일"
292292

293-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:110
293+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:113
294294
msgid "Invalid token: please try again."
295295
msgstr "잘못된 토큰 : 다시 시도하십시오."
296296

@@ -324,25 +324,25 @@ msgstr "책임"
324324
msgid "Local"
325325
msgstr "로컬"
326326

327-
#: src/components/TokenInput/TokenInput.tsx:24
327+
#: src/components/TokenInput/TokenInput.tsx:25
328328
msgid "Log in via an access token"
329329
msgstr "액세스 토큰을 통해 로그인"
330330

331-
#: src/components/LocalLogin/LocalLogin.tsx:72
331+
#: src/components/LocalLogin/LocalLogin.tsx:74
332332
msgid "Log in via username and password"
333333
msgstr "사용자 이름과 비밀번호를 통해 로그인하십시오."
334334

335-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:85
335+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:88
336336
msgid "Logged in: {0}"
337337
msgstr ""
338338

339-
#: src/components/LocalLogin/LocalLogin.tsx:80
339+
#: src/components/LocalLogin/LocalLogin.tsx:82
340340
msgid "Login"
341341
msgstr "로그인"
342342

343-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:107
344343
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:110
345344
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:113
345+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:116
346346
msgid "Login failed"
347347
msgstr "로그인 실패"
348348

@@ -418,7 +418,7 @@ msgstr "합법적으로 제한되는 모든 것에 대한 당사의 최대 총
418418
msgid "Our obligations"
419419
msgstr "우리의 의무"
420420

421-
#: src/components/LocalLogin/LocalLogin.tsx:78
421+
#: src/components/LocalLogin/LocalLogin.tsx:80
422422
msgid "Password"
423423
msgstr "암호"
424424

@@ -452,7 +452,7 @@ msgstr "파일을 선택하십시오"
452452
msgid "Please select a journal"
453453
msgstr "저널을 선택하세요"
454454

455-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:113
455+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:116
456456
msgid "Please try again."
457457
msgstr "다시 시도하십시오."
458458

@@ -652,11 +652,11 @@ msgstr "대기열 페이지 업로드"
652652
msgid "Upload to your site"
653653
msgstr "귀하의 사이트에 업로드"
654654

655-
#: src/components/LocalLogin/LocalLogin.tsx:75
655+
#: src/components/LocalLogin/LocalLogin.tsx:77
656656
msgid "Username"
657657
msgstr "사용자 이름"
658658

659-
#: src/components/TokenInput/TokenInput.tsx:26
659+
#: src/components/TokenInput/TokenInput.tsx:27
660660
msgid "Verify token"
661661
msgstr "토큰 확인"
662662

@@ -732,7 +732,7 @@ msgstr "마하라 URL: {url}"
732732
msgid "Your upload queue is empty"
733733
msgstr "업로드 대기열이 비어 있습니다"
734734

735-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:107
735+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:110
736736
msgid "Your username or password was incorrect. Please try again."
737737
msgstr "사용자 이름 또는 암호가 잘못되었습니다. 다시 시도하십시오."
738738

‎MaharaMobile/locales/ru/messages.po

+11-11
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ msgstr ""
309309
msgid "Invalid file"
310310
msgstr ""
311311

312-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:110
312+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:113
313313
msgid "Invalid token: please try again."
314314
msgstr ""
315315

@@ -352,25 +352,25 @@ msgstr ""
352352
msgid "Local"
353353
msgstr ""
354354

355-
#: src/components/TokenInput/TokenInput.tsx:24
355+
#: src/components/TokenInput/TokenInput.tsx:25
356356
msgid "Log in via an access token"
357357
msgstr ""
358358

359-
#: src/components/LocalLogin/LocalLogin.tsx:72
359+
#: src/components/LocalLogin/LocalLogin.tsx:74
360360
msgid "Log in via username and password"
361361
msgstr ""
362362

363-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:85
363+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:88
364364
msgid "Logged in: {0}"
365365
msgstr ""
366366

367-
#: src/components/LocalLogin/LocalLogin.tsx:80
367+
#: src/components/LocalLogin/LocalLogin.tsx:82
368368
msgid "Login"
369369
msgstr ""
370370

371-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:107
372371
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:110
373372
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:113
373+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:116
374374
msgid "Login failed"
375375
msgstr ""
376376

@@ -470,7 +470,7 @@ msgstr ""
470470
msgid "Our obligations"
471471
msgstr ""
472472

473-
#: src/components/LocalLogin/LocalLogin.tsx:78
473+
#: src/components/LocalLogin/LocalLogin.tsx:80
474474
msgid "Password"
475475
msgstr ""
476476

@@ -504,7 +504,7 @@ msgstr ""
504504
msgid "Please select a journal"
505505
msgstr ""
506506

507-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:113
507+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:116
508508
msgid "Please try again."
509509
msgstr ""
510510

@@ -708,11 +708,11 @@ msgstr ""
708708
msgid "Upload to your site"
709709
msgstr ""
710710

711-
#: src/components/LocalLogin/LocalLogin.tsx:75
711+
#: src/components/LocalLogin/LocalLogin.tsx:77
712712
msgid "Username"
713713
msgstr ""
714714

715-
#: src/components/TokenInput/TokenInput.tsx:26
715+
#: src/components/TokenInput/TokenInput.tsx:27
716716
msgid "Verify token"
717717
msgstr ""
718718

@@ -808,7 +808,7 @@ msgstr ""
808808
msgid "Your upload queue is empty"
809809
msgstr ""
810810

811-
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:107
811+
#: src/screens/LoginMethodScreen/LoginMethodScreen.tsx:110
812812
msgid "Your username or password was incorrect. Please try again."
813813
msgstr ""
814814

‎MaharaMobile/src/components/FlashMessage/FlashMessage.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
import {MessageDescriptor} from '@lingui/core';
12
import {Icon, Toast} from 'native-base';
23
import React from 'react';
34
import {Text} from 'react-native';
45
import styles from '../../assets/styles/variables';
56
import i18n from '../../i18n';
6-
import {MessageDescriptor, MessageInfoType} from '../../models/models';
7+
import {MessageInfoType} from '../../models/models';
78

89
const flashMessage = (
910
text: MessageDescriptor,

‎MaharaMobile/src/components/LocalLogin/LocalLogin.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import {t, Trans} from '@lingui/macro';
22
import {I18n} from '@lingui/react';
33
import React, {useState} from 'react';
4-
import {Platform, Text, TextInput, View} from 'react-native';
4+
import {ActivityIndicator, Platform, Text, TextInput, View} from 'react-native';
55
import {getManufacturer, getModel} from 'react-native-device-info';
66
import uuid from 'react-native-uuid';
77
import LogoSvg from '../../assets/images/Logo-big';
88
import forms from '../../assets/styles/forms';
99
import generic from '../../assets/styles/generic';
1010
import headingStyles from '../../assets/styles/headings';
11+
import variables from '../../assets/styles/variables';
1112
import {LOG_IN_ICON} from '../../utils/constants';
1213
import MaharaGradient from '../UI/MaharaGradient/MaharaGradient';
1314
import MediumButton from '../UI/MediumButton/MediumButton';
@@ -16,6 +17,7 @@ import styles from './LocalLogin.style';
1617
type Props = {
1718
url: string;
1819
onGetToken: Function;
20+
isLoading: boolean;
1921
};
2022

2123
export default function LocalLogin(props: Props) {
@@ -71,6 +73,9 @@ export default function LocalLogin(props: Props) {
7173
<View style={styles.imageWrapper}>
7274
<LogoSvg />
7375
</View>
76+
{props.isLoading ? (
77+
<ActivityIndicator size="small" color={variables.colors.light} />
78+
) : null}
7479
<Text style={[headingStyles.mainHeading, generic.center]}>
7580
<Trans>Log in via username and password</Trans>
7681
</Text>

‎MaharaMobile/src/components/MenuItem/MenuItem.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import {MessageDescriptor} from '@lingui/core';
12
import {I18n} from '@lingui/react';
23
import React from 'react';
34
import {Text, TouchableHighlight} from 'react-native';
4-
import {MessageDescriptor} from '../../models/models';
55
import menuItemStyles from './MenuItem.style';
66

77
type MenuItemProps = {

0 commit comments

Comments
 (0)