ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #809 from pangeachat/copyeditting

Browse source 
copyeditting and updated order of main menu options
This commit is contained in:
ggurdin 2024-10-23 12:48:14 -04:00 • committed by GitHub
commit 04b3fd6840
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assets/l10n/intl_en.arb
View file

@ -2563,7 +2563,7 @@
"type": "text",
"placeholders": {}
},
"interactiveTranslatorAllowedDesc": "Students can choose whether to use translation assistance in space group chats in Main Menu > My Learning Settings.",
"interactiveTranslatorAllowedDesc": "Students can choose whether to use translation assistance in space group chats in Main Menu > Learning Settings.",
"@interactiveTranslatorAllowedDesc": {
"type": "text",
"placeholders": {}
@ -3030,9 +3030,9 @@
"errorDisableLanguageAssistanceClassDesc": "Translation assistance and grammar assistance are turned off for the space that this chat is in.",
"itIsDisabled": "Interactive Translation is disabled",
"igcIsDisabled": "Interactive Grammar Checking is disabled",
"goToLearningSettings": "Go to My Learning Settings",
"goToLearningSettings": "Go to Learning Settings",
"error405Title": "Languages not set",
"error405Desc": "Please set your languages in Main Menu > My Learning Settings.",
"error405Desc": "Please set your languages in Main Menu > Learning Settings.",
"loginOrSignup": "Sign in with",
"@loginOrSignup": {
"type": "text",
@ -3095,7 +3095,7 @@
"type": "text",
"placeholders": {}
},
"learningSettings": "My Learning Settings",
"learningSettings": "Learning settings",
"classNameRequired": "Please enter a space name",
"@classNameRequired": {
"type": "text",

55
lib/pages/chat_list/client_chooser_button.dart
View file

@ -41,30 +41,17 @@ class ClientChooserButton extends StatelessWidget {
],
),
),
PopupMenuItem(
value: SettingsAction.learning,
child: Row(
children: [
const Icon(Icons.psychology_outlined),
const SizedBox(width: 18),
Expanded(child: Text(L10n.of(context)!.learningSettings)),
],
),
),
// PopupMenuItem(
// value: SettingsAction.newGroup,
// child: Row(
// children: [
// const Icon(Icons.group_add_outlined),
// const SizedBox(width: 18),
// Text(L10n.of(context)!.createGroup),
// ],
// ),
// ),
// Pangea#
PopupMenuItem(
value: SettingsAction.newGroup,
child: Row(
children: [
const Icon(Icons.group_add_outlined),
const SizedBox(width: 18),
// #Pangea
Expanded(child: Text(L10n.of(context)!.createGroup)),
// Text(L10n.of(context)!.createGroup),
// Pangea#
],
),
),
PopupMenuItem(
value: SettingsAction.newSpace,
child: Row(
@ -79,6 +66,16 @@ class ClientChooserButton extends StatelessWidget {
),
),
// #Pangea
PopupMenuItem(
value: SettingsAction.learning,
child: Row(
children: [
const Icon(Icons.psychology_outlined),
const SizedBox(width: 18),
Expanded(child: Text(L10n.of(context)!.learningSettings)),
],
),
),
// PopupMenuItem(
// value: SettingsAction.setStatus,
// child: Row(
@ -306,9 +303,11 @@ class ClientChooserButton extends StatelessWidget {
if (consent != OkCancelResult.ok) return;
context.go('/rooms/settings/addaccount');
break;
case SettingsAction.newGroup:
context.go('/rooms/newgroup');
break;
// #Pangea
// case SettingsAction.newGroup:
// context.go('/rooms/newgroup');
// break;
// Pangea#
case SettingsAction.newSpace:
controller.createNewSpace();
break;
@ -416,7 +415,9 @@ class ClientChooserButton extends StatelessWidget {
enum SettingsAction {
addAccount,
newGroup,
// #Pangea
// newGroup,
// Pangea#
newSpace,
// #Pangea
// setStatus,

5
lib/pages/new_group/new_group_view.dart
View file

@ -24,7 +24,10 @@ class NewGroupView extends StatelessWidget {
onPressed: controller.loading ? null : Navigator.of(context).pop,
),
),
title: Text(L10n.of(context)!.createGroup),
// #Pangea
// title: Text(L10n.of(context)!.createGroup),
title: Text(L10n.of(context)!.newChat),
// Pangea#
),
body: MaxWidthBody(
child: Column(