From 1e2c69eb4cf0463636a4fb0316d2ab29af19d408 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Mon, 14 Jun 2021 17:38:07 -0700 Subject: [PATCH] Translations --- LIBCWTCH-GO.version | 2 +- lib/views/addcontactview.dart | 2 +- lib/views/addeditprofileview.dart | 4 ++-- lib/views/doublecolview.dart | 4 ++-- lib/views/groupsettingsview.dart | 2 +- lib/views/messageview.dart | 4 ++-- lib/views/peersettingsview.dart | 2 +- lib/views/torstatusview.dart | 6 +++--- lib/views/triplecolview.dart | 6 +++--- lib/widgets/malformedbubble.dart | 3 ++- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/LIBCWTCH-GO.version b/LIBCWTCH-GO.version index d21cb28..7b09870 100644 --- a/LIBCWTCH-GO.version +++ b/LIBCWTCH-GO.version @@ -1 +1 @@ -v0.0.2-63-g033de73-2021-06-11-21-41 \ No newline at end of file +v0.0.2-66-g39187a7-2021-06-15-00-32 \ No newline at end of file diff --git a/lib/views/addcontactview.dart b/lib/views/addcontactview.dart index 3c27c64..5947d3f 100644 --- a/lib/views/addcontactview.dart +++ b/lib/views/addcontactview.dart @@ -167,7 +167,7 @@ class _AddContactViewState extends State { Widget addGroupTab() { // TODO We should replace with with a "Paste in Server Key Bundle" if (Provider.of(context).serverList.servers.isEmpty) { - return Text("You need to add a server before you can create a group."); + return Text(AppLocalizations.of(context)!.addServerFirst); } return Container( diff --git a/lib/views/addeditprofileview.dart b/lib/views/addeditprofileview.dart index 03bafb8..d2a1dff 100644 --- a/lib/views/addeditprofileview.dart +++ b/lib/views/addeditprofileview.dart @@ -313,7 +313,7 @@ class _AddEditProfileViewState extends State { showAlertDialog(BuildContext context) { // set up the buttons Widget cancelButton = TextButton( - child: Text("Cancel"), + child: Text(AppLocalizations.of(context)!.cancel), onPressed: () { Navigator.of(context).pop(); // dismiss dialog }, @@ -328,7 +328,7 @@ class _AddEditProfileViewState extends State { const Duration(milliseconds: 500), () { if (globalErrorHandler.deleteProfileSuccess) { - final snackBar = SnackBar(content: Text("Successfully deleted profile:" + onion)); + final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.deleteProfileSuccess + ":" + onion)); ScaffoldMessenger.of(context).showSnackBar(snackBar); Navigator.of(context).popUntil((route) => route.isFirst); // dismiss dialog } else { diff --git a/lib/views/doublecolview.dart b/lib/views/doublecolview.dart index 5abaa1b..2b5ba8e 100644 --- a/lib/views/doublecolview.dart +++ b/lib/views/doublecolview.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; - +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import '../main.dart'; import '../model.dart'; import 'contactsview.dart'; @@ -27,7 +27,7 @@ class _DoubleColumnViewState extends State { Flexible( flex: flwtch.columns[1], child: flwtch.selectedConversation == "" - ? Center(child: Text("pick a contact")) + ? Center(child: Text(AppLocalizations.of(context)!.addContactFirst)) : //dev MultiProvider(providers: [ ChangeNotifierProvider.value(value: Provider.of(context)), diff --git a/lib/views/groupsettingsview.dart b/lib/views/groupsettingsview.dart index 03f52af..f1e50b9 100644 --- a/lib/views/groupsettingsview.dart +++ b/lib/views/groupsettingsview.dart @@ -159,7 +159,7 @@ class _GroupSettingsViewState extends State { showAlertDialog(BuildContext context) { // set up the buttons Widget cancelButton = TextButton( - child: Text("Cancel"), + child: Text(AppLocalizations.of(context)!.cancel), style: ButtonStyle(padding: MaterialStateProperty.all(EdgeInsets.all(20))), onPressed: () { Navigator.of(context).pop(); // dismiss dialog diff --git a/lib/views/messageview.dart b/lib/views/messageview.dart index 4f68556..8fe7a65 100644 --- a/lib/views/messageview.dart +++ b/lib/views/messageview.dart @@ -139,11 +139,11 @@ class _MessageViewState extends State { enabled: true, prefixIcon: IconButton( icon: Icon(CwtchIcons.send_invite, size: 24, color: Provider.of(context).theme.mainTextColor()), - tooltip: "Send a contact or group invite", + tooltip: AppLocalizations.of(context)!.sendInvite, onPressed: () => _modalSendInvitation(context)), suffixIcon: IconButton( icon: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of(context).theme.mainTextColor()), - tooltip: "Send Message", + tooltip: AppLocalizations.of(context)!.sendMessage, onPressed: _sendMessage, ), ))), diff --git a/lib/views/peersettingsview.dart b/lib/views/peersettingsview.dart index 608ab54..892d4cf 100644 --- a/lib/views/peersettingsview.dart +++ b/lib/views/peersettingsview.dart @@ -78,7 +78,7 @@ class _PeerSettingsViewState extends State { final setPeerAttributeJson = jsonEncode(setPeerAttribute); Provider.of(context, listen: false).cwtch.SendProfileEvent(profileOnion, setPeerAttributeJson); // todo translations - final snackBar = SnackBar(content: Text("Nickname changed successfully")); + final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.nickChangeSuccess)); ScaffoldMessenger.of(context).showSnackBar(snackBar); }, icon: Icon(Icons.save), diff --git a/lib/views/torstatusview.dart b/lib/views/torstatusview.dart index 41a7ce1..189e4a7 100644 --- a/lib/views/torstatusview.dart +++ b/lib/views/torstatusview.dart @@ -23,7 +23,7 @@ class _TorStatusView extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - title: Text("Tor Network Status"), + title: Text(AppLocalizations.of(context)!.torNetworkStatus), ), body: _buildSettingsList(), ); @@ -43,10 +43,10 @@ class _TorStatusView extends State { child: Column(children: [ ListTile( leading: TorIcon(), - title: Text("Tor Status"), + title: Text(AppLocalizations.of(context)!.torStatus), subtitle: Text(torStatus.progress == 100 ? AppLocalizations.of(context)!.networkStatusOnline : torStatus.status), trailing: ElevatedButton( - child: Text("Reset"), + child: Text(AppLocalizations.of(context)!.resetTor), onPressed: () { Provider.of(context, listen: false).cwtch.ResetTor(); }, diff --git a/lib/views/triplecolview.dart b/lib/views/triplecolview.dart index 9469c48..a4f1e44 100644 --- a/lib/views/triplecolview.dart +++ b/lib/views/triplecolview.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:cwtch/views/profilemgrview.dart'; import 'package:provider/provider.dart'; - +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import '../main.dart'; import 'contactsview.dart'; import 'messageview.dart'; @@ -22,12 +22,12 @@ class _TripleColumnViewState extends State { ), Flexible( flex: flwtch.columns[1], - child: flwtch.selectedProfile == null ? Center(child: Text("pick a profile")) : ContactsView(), //dev + child: flwtch.selectedProfile == null ? Center(child: Text(AppLocalizations.of(context)!.createProfileToBegin)) : ContactsView(), //dev ), Flexible( flex: flwtch.columns[2], child: flwtch.selectedConversation == "" - ? Center(child: Text("pick a contact")) + ? Center(child: Text(AppLocalizations.of(context)!.addContactFirst)) : //dev Container(child: MessageView()), ), diff --git a/lib/widgets/malformedbubble.dart b/lib/widgets/malformedbubble.dart index fea7c1a..c56c48c 100644 --- a/lib/widgets/malformedbubble.dart +++ b/lib/widgets/malformedbubble.dart @@ -1,5 +1,6 @@ import 'package:cwtch/cwtch_icons_icons.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; final Color malformedColor = Color(0xFFE85DA1); @@ -45,7 +46,7 @@ class MalformedBubbleState extends State { crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, mainAxisSize: MainAxisSize.min, - children: [Text("Malformed Message")], + children: [Text(AppLocalizations.of(context)!.malformedMessage)], )) ]))))); });