Skip to content

Commit b982dac

Browse files
Pavel401Pavel401
authored
Merge pull request #365 from BrawlerXull/profile-page-multilang
Profile page multilang
2 parents 1c09780 + db7f89c commit b982dac

File tree

11 files changed

+462
-65
lines changed

11 files changed

+462
-65
lines changed

‎lib/app/modules/manageTaskServer/views/manage_task_server_page_app_bar.dart‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import 'package:taskwarrior/app/utils/constants/taskwarrior_fonts.dart';
1313
import 'package:taskwarrior/app/utils/constants/utilites.dart';
1414

1515
import 'package:taskwarrior/app/utils/gen/fonts.gen.dart';
16+
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';
1617
import 'package:taskwarrior/app/utils/theme/app_settings.dart';
1718
import 'package:url_launcher/url_launcher.dart';
1819

@@ -32,7 +33,9 @@ class ManageTaskServerPageAppBar extends StatelessWidget
3233
crossAxisAlignment: CrossAxisAlignment.start,
3334
children: [
3435
Text(
35-
"Configure TaskServer",
36+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
37+
.sentences
38+
.manageTaskServerPageConfigureTaskserver,
3639
style: TextStyle(
3740
fontFamily: FontFamily.poppins,
3841
color: TaskWarriorColors.white,

‎lib/app/modules/manageTaskServer/views/manage_task_server_page_body.dart‎

Lines changed: 109 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:taskwarrior/app/models/storage/set_config.dart';
88
import 'package:taskwarrior/app/modules/manageTaskServer/views/pem_widget.dart';
99
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
1010
import 'package:taskwarrior/app/utils/constants/taskwarrior_fonts.dart';
11+
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';
1112

1213
import 'package:taskwarrior/app/utils/theme/app_settings.dart';
1314

@@ -33,7 +34,9 @@ class ManageTaskServerPageBody extends StatelessWidget {
3334
crossAxisAlignment: CrossAxisAlignment.start,
3435
children: [
3536
Text(
36-
"Configure TASKRC",
37+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
38+
.sentences
39+
.manageTaskServerPageConfigureTASKRC,
3740
style: TextStyle(
3841
color: AppSettings.isDarkMode
3942
? TaskWarriorColors.white
@@ -76,7 +79,11 @@ class ManageTaskServerPageBody extends StatelessWidget {
7679
MainAxisAlignment.start,
7780
children: [
7881
Text(
79-
'Configure TaskRc',
82+
SentenceManager(
83+
currentLanguage: AppSettings
84+
.selectedLanguage)
85+
.sentences
86+
.manageTaskServerPageConfigureTaskRCDialogueBoxTitle,
8087
style: TextStyle(
8188
fontWeight: TaskWarriorFonts.bold,
8289
color: AppSettings.isDarkMode
@@ -85,7 +92,11 @@ class ManageTaskServerPageBody extends StatelessWidget {
8592
),
8693
),
8794
Text(
88-
'Paste the taskrc content or select taskrc file',
95+
SentenceManager(
96+
currentLanguage: AppSettings
97+
.selectedLanguage)
98+
.sentences
99+
.manageTaskServerPageConfigureTaskRCDialogueBoxSubtitle,
89100
style: TextStyle(
90101
color: AppSettings.isDarkMode
91102
? TaskWarriorColors.white
@@ -107,44 +118,52 @@ class ManageTaskServerPageBody extends StatelessWidget {
107118
.taskrcContentController,
108119
maxLines: 8,
109120
decoration: InputDecoration(
110-
counterStyle: TextStyle(
111-
color:
112-
AppSettings.isDarkMode
113-
? TaskWarriorColors
114-
.white
115-
: TaskWarriorColors
116-
.black),
117-
suffixIconConstraints:
118-
const BoxConstraints(
119-
maxHeight: 24,
120-
maxWidth: 24,
121-
),
122-
isDense: true,
123-
suffix: IconButton(
124-
onPressed: () async {
125-
controller
126-
.setContent(context);
127-
},
128-
icon: const Icon(
129-
Icons.content_paste),
130-
),
131-
border:
132-
const OutlineInputBorder(),
133-
labelStyle:
134-
GoogleFonts.poppins(
135-
color: AppSettings
136-
.isDarkMode
137-
? TaskWarriorColors
138-
.white
139-
: TaskWarriorColors
140-
.black),
141-
labelText:
142-
'Paste your taskrc contents here'),
121+
counterStyle: TextStyle(
122+
color:
123+
AppSettings.isDarkMode
124+
? TaskWarriorColors
125+
.white
126+
: TaskWarriorColors
127+
.black),
128+
suffixIconConstraints:
129+
const BoxConstraints(
130+
maxHeight: 24,
131+
maxWidth: 24,
132+
),
133+
isDense: true,
134+
suffix: IconButton(
135+
onPressed: () async {
136+
controller
137+
.setContent(context);
138+
},
139+
icon: const Icon(
140+
Icons.content_paste),
141+
),
142+
border:
143+
const OutlineInputBorder(),
144+
labelStyle: GoogleFonts.poppins(
145+
color:
146+
AppSettings.isDarkMode
147+
? TaskWarriorColors
148+
.white
149+
: TaskWarriorColors
150+
.black),
151+
labelText: SentenceManager(
152+
currentLanguage:
153+
AppSettings
154+
.selectedLanguage)
155+
.sentences
156+
.manageTaskServerPageConfigureTaskRCDialogueBoxInputFieldText,
157+
),
143158
),
144159
),
145160
),
146161
Text(
147-
"Or",
162+
SentenceManager(
163+
currentLanguage: AppSettings
164+
.selectedLanguage)
165+
.sentences
166+
.manageTaskServerPageConfigureTaskRCDialogueBoxOr,
148167
style: TextStyle(
149168
color: AppSettings.isDarkMode
150169
? TaskWarriorColors.white
@@ -170,7 +189,11 @@ class ManageTaskServerPageBody extends StatelessWidget {
170189
Get.back();
171190
},
172191
child: Text(
173-
'Select TASKRC file',
192+
SentenceManager(
193+
currentLanguage: AppSettings
194+
.selectedLanguage)
195+
.sentences
196+
.manageTaskServerPageConfigureTaskRCDialogueBoxSelectTaskRC,
174197
style: TextStyle(
175198
color: AppSettings.isDarkMode
176199
? TaskWarriorColors.white
@@ -203,8 +226,16 @@ class ManageTaskServerPageBody extends StatelessWidget {
203226
children: [
204227
Text(
205228
controller.taskrcContentController.text.isEmpty
206-
? "Set TaskRc"
207-
: "Taskrc file is verified",
229+
? SentenceManager(
230+
currentLanguage:
231+
AppSettings.selectedLanguage)
232+
.sentences
233+
.manageTaskServerPageSetTaskRC
234+
: SentenceManager(
235+
currentLanguage:
236+
AppSettings.selectedLanguage)
237+
.sentences
238+
.manageTaskServerPageTaskRCFileIsVerified,
208239
style: TextStyle(
209240
color: AppSettings.isDarkMode
210241
? TaskWarriorColors.white
@@ -445,19 +476,49 @@ class ManageTaskServerPageBody extends StatelessWidget {
445476
storage: controller.storage,
446477
pem: pem,
447478
optionString: pem == "taskd.certificate"
448-
? "Configure your certificate"
479+
? SentenceManager(
480+
currentLanguage: AppSettings.selectedLanguage)
481+
.sentences
482+
.manageTaskServerPageConfigureYourCertificate
449483
: pem == "taskd.key"
450-
? "Configure TaskServer key"
484+
? SentenceManager(
485+
currentLanguage:
486+
AppSettings.selectedLanguage)
487+
.sentences
488+
.manageTaskServerPageConfigureTaskserverKey
451489
: pem == "taskd.ca"
452-
? "Configure Server Certificate"
453-
: "Configure Server Certificate",
490+
? SentenceManager(
491+
currentLanguage:
492+
AppSettings.selectedLanguage)
493+
.sentences
494+
.manageTaskServerPageConfigureServerCertificate
495+
: SentenceManager(
496+
currentLanguage:
497+
AppSettings.selectedLanguage)
498+
.sentences
499+
.manageTaskServerPageConfigureServerCertificate,
454500
listTileTitle: pem == "taskd.certificate"
455-
? "Select Certificate"
501+
? SentenceManager(
502+
currentLanguage: AppSettings.selectedLanguage)
503+
.sentences
504+
.manageTaskServerPageSelectCertificate
456505
: pem == "taskd.key"
457-
? "Select key"
506+
? SentenceManager(
507+
currentLanguage:
508+
AppSettings.selectedLanguage)
509+
.sentences
510+
.manageTaskServerPageSelectKey
458511
: pem == "taskd.ca"
459-
? "Select Certificate"
460-
: "Select Certificate",
512+
? SentenceManager(
513+
currentLanguage:
514+
AppSettings.selectedLanguage)
515+
.sentences
516+
.manageTaskServerPageSelectCertificate
517+
: SentenceManager(
518+
currentLanguage:
519+
AppSettings.selectedLanguage)
520+
.sentences
521+
.manageTaskServerPageSelectCertificate,
461522
onTapCallBack: controller.onTapPEMWidget,
462523
onLongPressCallBack: controller.onLongPressPEMWidget,
463524
),

‎lib/app/modules/profile/views/deleteprofiledialog.dart‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'package:get/get.dart';
33
import 'package:taskwarrior/app/modules/splash/controllers/splash_controller.dart';
44
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
55
import 'package:taskwarrior/app/utils/constants/utilites.dart';
6+
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';
67
import 'package:taskwarrior/app/utils/theme/app_settings.dart';
78

89
class DeleteProfileDialog extends StatelessWidget {
@@ -23,7 +24,10 @@ class DeleteProfileDialog extends StatelessWidget {
2324
child: Utils.showAlertDialog(
2425
scrollable: true,
2526
title: Text(
26-
'Delete Profile?',
27+
SentenceManager(
28+
currentLanguage: AppSettings.selectedLanguage)
29+
.sentences
30+
.profilePageDeleteProfile,
2731
style: TextStyle(
2832
color: AppSettings.isDarkMode
2933
? TaskWarriorColors.white

‎lib/app/modules/profile/views/manageprofile.dart‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
22
import 'package:google_fonts/google_fonts.dart';
33
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
44
import 'package:taskwarrior/app/utils/constants/taskwarrior_fonts.dart';
5+
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';
56
import 'package:taskwarrior/app/utils/theme/app_settings.dart';
67

78
import 'package:tuple/tuple.dart';
@@ -25,11 +26,41 @@ class ManageProfile extends StatelessWidget {
2526
@override
2627
Widget build(BuildContext context) {
2728
var triples = [
28-
Tuple3(Icons.edit, 'Rename Alias', rename),
29-
Tuple3(Icons.link, 'Configure Taskserver', configure),
30-
Tuple3(Icons.upload, 'Export tasks', export),
31-
Tuple3(Icons.copy, 'Copy config to new profile', copy),
32-
Tuple3(Icons.delete, 'Delete profile', delete),
29+
Tuple3(
30+
Icons.edit,
31+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
32+
.sentences
33+
.profilePageRenameAlias,
34+
rename,
35+
),
36+
Tuple3(
37+
Icons.link,
38+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
39+
.sentences
40+
.profilePageConfigureTaskserver,
41+
configure,
42+
),
43+
Tuple3(
44+
Icons.upload,
45+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
46+
.sentences
47+
.profilePageExportTasks,
48+
export,
49+
),
50+
Tuple3(
51+
Icons.copy,
52+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
53+
.sentences
54+
.profilePageCopyConfigToNewProfile,
55+
copy,
56+
),
57+
Tuple3(
58+
Icons.delete,
59+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
60+
.sentences
61+
.profilePageDeleteProfile,
62+
delete,
63+
),
3364
];
3465

3566
return ExpansionTile(
@@ -49,7 +80,9 @@ class ManageProfile extends StatelessWidget {
4980
? TaskWarriorColors.white
5081
: TaskWarriorColors.black,
5182
title: Text(
52-
'Manage selected profile',
83+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
84+
.sentences
85+
.profilePageManageSelectedProfile,
5386
style: GoogleFonts.poppins(
5487
fontWeight: TaskWarriorFonts.bold,
5588
fontSize: TaskWarriorFonts.fontSizeMedium,

0 commit comments

Comments
 (0)