SelfPrivacy/selfprivacy.org.app
1
0
Fork 0
mirror of https://git.selfprivacy.org/kherel/selfprivacy.org.app.git synced 2025-01-08 00:51:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into users-order

Browse source
This commit is contained in:
NaiJi 2023-09-18 12:26:50 -03:00
parent 5c329d47c1 f34c4417b6
commit dae535e35a
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assets/translations/en.json
View file

@ -304,6 +304,7 @@
"extending_volume_price_info": "Price includes VAT and is estimated from pricing data provided by your server provider. Server will be rebooted after resizing.", "extending_volume_price_info": "Price includes VAT and is estimated from pricing data provided by your server provider. Server will be rebooted after resizing.",
"extending_volume_error": "Couldn't initialize volume extending.", "extending_volume_error": "Couldn't initialize volume extending.",
"size": "Size", "size": "Size",
"price": "Price",
"data_migration_title": "Data migration", "data_migration_title": "Data migration",
"data_migration_notice": "During migration all services will be turned off.", "data_migration_notice": "During migration all services will be turned off.",
"start_migration_button": "Start migration", "start_migration_button": "Start migration",
@ -625,4 +626,4 @@
"reset_onboarding_description": "Reset onboarding switch to show onboarding screen again", "reset_onboarding_description": "Reset onboarding switch to show onboarding screen again",
"cubit_statuses": "Cubit loading statuses" "cubit_statuses": "Cubit loading statuses"
} }
} }

10
lib/ui/pages/server_storage/extending_volume.dart
View file

@ -79,10 +79,12 @@ class _ExtendingVolumePageState extends State<ExtendingVolumePage> {
} }
final price = snapshot.data as Price; final price = snapshot.data as Price;
_pricePerGb = price.value; _pricePerGb = price.value;
_sizeController.text = _currentSliderGbValue.truncate().toString(); final currentSizeValue = _currentSliderGbValue.truncate().toString();
_sizeController.text = 'storage.gb'.tr(args: [currentSizeValue]);
_priceController.text = _priceController.text =
(_pricePerGb * double.parse(_sizeController.text)) '${(_pricePerGb * double.parse(currentSizeValue)).toStringAsFixed(2)}'
.toStringAsFixed(2); ' '
'${price.currency.shortcode}';
minSize = minSize =
widget.diskVolumeToResize.sizeTotal + DiskSize.fromGibibyte(3); widget.diskVolumeToResize.sizeTotal + DiskSize.fromGibibyte(3);
if (_currentSliderGbValue < 0) { if (_currentSliderGbValue < 0) {
@ -130,7 +132,7 @@ class _ExtendingVolumePageState extends State<ExtendingVolumePage> {
decoration: InputDecoration( decoration: InputDecoration(
border: const OutlineInputBorder(), border: const OutlineInputBorder(),
errorText: _isError ? ' ' : null, errorText: _isError ? ' ' : null,
labelText: price.currency.shortcode, labelText: 'storage.price'.tr(),
), ),
), ),
), ),

8
lib/ui/pages/services/services.dart
View file

@ -160,13 +160,15 @@ class _Card extends StatelessWidget {
], ],
), ),
Text( Text(
service.loginInfo, service.description,
style: Theme.of(context).textTheme.bodyMedium, style: Theme.of(context).textTheme.bodyMedium,
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
Text( Text(
service.description, service.loginInfo,
style: Theme.of(context).textTheme.bodyMedium, style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Theme.of(context).colorScheme.secondary,
),
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
], ],