cwtch.im
/
cwtch-ui
10
11
Fork 17
Code Issues 87 Pull Requests 1 Projects 2 Releases 28 Wiki Activity

Update Translations + Error Reporting
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
Sarah Jamie Lewis 2022-01-12 15:15:58 -08:00
parent 958be3e8f7
commit 26f32a0790
10 changed files with 69 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/l10n/intl_de.arb
View File

@ -1,6 +1,7 @@
{
"@@locale": "de",
"@@last_modified": "2022-01-12T22:53:15+01:00",
"@@last_modified": "2022-01-12T23:54:51+01:00",
"torSettingsErrorSettingPort": "Port Number must be between 1 and 65535",
"torSettingsUseCustomTorServiceConfigurastionDescription": "Override the default tor configuration. Warning: This could be dangerous. Only turn this on if you know what you are doing.",
"torSettingsUseCustomTorServiceConfiguration": "Use a Custom Tor Service Configuration (torrc)",
"torSettingsCustomControlPortDescription": "Use a custom port for control connections to the Tor proxy",

3
lib/l10n/intl_en.arb
View File

@ -1,6 +1,7 @@
{
"@@locale": "en",
"@@last_modified": "2022-01-12T22:53:15+01:00",
"@@last_modified": "2022-01-12T23:54:51+01:00",
"torSettingsErrorSettingPort": "Port Number must be between 1 and 65535",
"settingTheme": "Use Light Themes",
"torSettingsUseCustomTorServiceConfiguration": "Use a Custom Tor Service Configuration (torrc)",
"torSettingsUseCustomTorServiceConfigurastionDescription": "Override the default tor configuration. Warning: This could be dangerous. Only turn this on if you know what you are doing.",

3
lib/l10n/intl_es.arb
View File

@ -1,6 +1,7 @@
{
"@@locale": "es",
"@@last_modified": "2022-01-12T22:53:15+01:00",
"@@last_modified": "2022-01-12T23:54:51+01:00",
"torSettingsErrorSettingPort": "Port Number must be between 1 and 65535",
"torSettingsUseCustomTorServiceConfigurastionDescription": "Override the default tor configuration. Warning: This could be dangerous. Only turn this on if you know what you are doing.",
"torSettingsUseCustomTorServiceConfiguration": "Use a Custom Tor Service Configuration (torrc)",
"torSettingsCustomControlPortDescription": "Use a custom port for control connections to the Tor proxy",

3
lib/l10n/intl_fr.arb
View File

@ -1,6 +1,7 @@
{
"@@locale": "fr",
"@@last_modified": "2022-01-12T22:53:15+01:00",
"@@last_modified": "2022-01-12T23:54:51+01:00",
"torSettingsErrorSettingPort": "Port Number must be between 1 and 65535",
"torSettingsUseCustomTorServiceConfigurastionDescription": "Override the default tor configuration. Warning: This could be dangerous. Only turn this on if you know what you are doing.",
"torSettingsUseCustomTorServiceConfiguration": "Use a Custom Tor Service Configuration (torrc)",
"torSettingsCustomControlPortDescription": "Use a custom port for control connections to the Tor proxy",

3
lib/l10n/intl_it.arb
View File

@ -1,6 +1,7 @@
{
"@@locale": "it",
"@@last_modified": "2022-01-12T22:53:15+01:00",
"@@last_modified": "2022-01-12T23:54:51+01:00",
"torSettingsErrorSettingPort": "Port Number must be between 1 and 65535",
"torSettingsUseCustomTorServiceConfigurastionDescription": "Override the default tor configuration. Warning: This could be dangerous. Only turn this on if you know what you are doing.",
"torSettingsUseCustomTorServiceConfiguration": "Use a Custom Tor Service Configuration (torrc)",
"torSettingsCustomControlPortDescription": "Use a custom port for control connections to the Tor proxy",

3
lib/l10n/intl_pl.arb
View File

@ -1,6 +1,7 @@
{
"@@locale": "pl",
"@@last_modified": "2022-01-12T22:53:15+01:00",
"@@last_modified": "2022-01-12T23:54:51+01:00",
"torSettingsErrorSettingPort": "Port Number must be between 1 and 65535",
"torSettingsUseCustomTorServiceConfigurastionDescription": "Override the default tor configuration. Warning: This could be dangerous. Only turn this on if you know what you are doing.",
"torSettingsUseCustomTorServiceConfiguration": "Use a Custom Tor Service Configuration (torrc)",
"torSettingsCustomControlPortDescription": "Use a custom port for control connections to the Tor proxy",

3
lib/l10n/intl_pt.arb
View File

@ -1,6 +1,7 @@
{
"@@locale": "pt",
"@@last_modified": "2022-01-12T22:53:15+01:00",
"@@last_modified": "2022-01-12T23:54:51+01:00",
"torSettingsErrorSettingPort": "Port Number must be between 1 and 65535",
"torSettingsUseCustomTorServiceConfigurastionDescription": "Override the default tor configuration. Warning: This could be dangerous. Only turn this on if you know what you are doing.",
"torSettingsUseCustomTorServiceConfiguration": "Use a Custom Tor Service Configuration (torrc)",
"torSettingsCustomControlPortDescription": "Use a custom port for control connections to the Tor proxy",

3
lib/l10n/intl_ru.arb
View File

@ -1,6 +1,7 @@
{
"@@locale": "ru",
"@@last_modified": "2022-01-12T22:53:15+01:00",
"@@last_modified": "2022-01-12T23:54:51+01:00",
"torSettingsErrorSettingPort": "Port Number must be between 1 and 65535",
"msgAddToAccept": "Добавьте учетную запись в контакты, чтобы принять этот файл.",
"btnSendFile": "Отправить файл",
"msgConfirmSend": "Вы уверены, что хотите отправить?",

53
lib/views/torstatusview.dart
View File

@ -96,13 +96,33 @@ class _TorStatusView extends State<TorStatusView> {
subtitle: Text(AppLocalizations.of(context)!.torSettingsCustomSocksPortDescription),
leading: Icon(CwtchIcons.swap_horiz_24px, color: settings.current().mainTextColor),
trailing: Container(
width: 100,
width: 300,
child: CwtchTextField(
number: true,
controller: torSocksPortController,
validator: (value) {
try {
var port = int.parse(value);
if (port > 0 && port < 65536) {
return null;
} else {
return AppLocalizations.of(
context)!
.torSettingsErrorSettingPort;
}
}catch (e) {
return AppLocalizations.of(
context)!
.torSettingsErrorSettingPort;
}
},
onChanged: (String socksPort) {
try {
settings.socksPort = int.parse(socksPort);
saveSettings(context);
var port = int.parse(socksPort);
if (port > 0 && port < 65536) {
settings.socksPort = int.parse(socksPort);
saveSettings(context);
}
} catch (e) {}
},
))),
@ -111,13 +131,34 @@ class _TorStatusView extends State<TorStatusView> {
subtitle: Text(AppLocalizations.of(context)!.torSettingsCustomControlPortDescription),
leading: Icon(CwtchIcons.swap_horiz_24px, color: settings.current().mainTextColor),
trailing: Container(
width: 100,
width: 300,
child: CwtchTextField(
number: true,
controller: torControlPortController,
validator: (value) {
try {
var port = int.parse(value);
if (port > 0 && port < 65536) {
return null;
} else {
return AppLocalizations.of(
context)!
.torSettingsErrorSettingPort;
}
}catch (e) {
return AppLocalizations.of(
context)!
.torSettingsErrorSettingPort;
}
},
onChanged: (String controlPort) {
try {
settings.controlPort = int.parse(controlPort);
saveSettings(context);
var port = int.parse(controlPort);
if (port > 0 && port < 65536) {
settings.controlPort =
int.parse(controlPort);
saveSettings(context);
}
} catch (e) {}
},
))),

6
lib/widgets/textfield.dart
View File

@ -44,17 +44,22 @@ class _CwtchTextFieldState extends State<CwtchTextField> {
validator: widget.validator,
onChanged: widget.onChanged,
autofocus: widget.autofocus,
autovalidateMode: AutovalidateMode.onUserInteraction,
textAlign: widget.number ? TextAlign.end : TextAlign.start,
keyboardType: widget.multiLine
? TextInputType.multiline
: widget.number
? TextInputType.number
: TextInputType.text,
inputFormatters: widget.number ? <TextInputFormatter>[
FilteringTextInputFormatter.digitsOnly
] : null,
maxLines: widget.multiLine ? null : 1,
scrollController: _scrollController,
enableIMEPersonalizedLearning: false,
focusNode: _focusNode,
decoration: InputDecoration(
errorMaxLines: 2,
hintText: widget.hintText,
floatingLabelBehavior: FloatingLabelBehavior.never,
filled: true,
@ -64,6 +69,7 @@ class _CwtchTextFieldState extends State<CwtchTextField> {
errorStyle: TextStyle(
color: theme.current().textfieldErrorColor,
fontWeight: FontWeight.bold,
overflow: TextOverflow.visible
),
fillColor: theme.current().textfieldBackgroundColor,
contentPadding: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),