android-apps-mirrors/Rain
0
0
Fork 0
mirror of https://github.com/darkmoonight/Rain.git synced 2025-06-28 20:19:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add da_DK locale and fix error

Browse source
This commit is contained in:
Yoshi 2024-02-13 22:32:28 +03:00
parent cda285ea15
commit fa5fbb8ce6
4 changed files with 32 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

37
lib/app/modules/settings/view/settings.dart
View file

@ -1,5 +1,4 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_colorpicker/flutter_colorpicker.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
@ -311,14 +310,16 @@ class _SettingsPageState extends State<SettingsPage> {
infoSettings: true,
infoWidget: _TextInfo(
info: settings.timeformat == '12'
? DateFormat.jm().format(DateFormat.Hm()
.parse(weatherController
.timeConvert(timeStart)
.format(context)))
: DateFormat.Hm().format(DateFormat.Hm()
.parse(weatherController
.timeConvert(timeStart)
.format(context))),
? DateFormat.jm(locale.languageCode).format(
DateFormat.Hm(locale.languageCode)
.parse(weatherController
.timeConvert(timeStart)
.format(context)))
: DateFormat.Hm(locale.languageCode).format(
DateFormat.Hm(locale.languageCode)
.parse(weatherController
.timeConvert(timeStart)
.format(context))),
),
onPressed: () async {
final TimeOfDay? timeStartPicker =
@ -365,14 +366,16 @@ class _SettingsPageState extends State<SettingsPage> {
infoSettings: true,
infoWidget: _TextInfo(
info: settings.timeformat == '12'
? DateFormat.jm().format(DateFormat.Hm()
.parse(weatherController
.timeConvert(timeEnd)
.format(context)))
: DateFormat.Hm().format(DateFormat.Hm()
.parse(weatherController
.timeConvert(timeEnd)
.format(context))),
? DateFormat.jm(locale.languageCode).format(
DateFormat.Hm(locale.languageCode)
.parse(weatherController
.timeConvert(timeEnd)
.format(context)))
: DateFormat.Hm(locale.languageCode).format(
DateFormat.Hm(locale.languageCode)
.parse(weatherController
.timeConvert(timeEnd)
.format(context))),
),
onPressed: () async {
final TimeOfDay? timeEndPicker =

15
lib/app/widgets/status/status_data.dart
View file

@ -55,22 +55,25 @@ class StatusData {
String getTimeFormat(String time) {
switch (settings.timeformat) {
case '12':
return DateFormat.jm().format(DateTime.tryParse(time)!);
return DateFormat.jm(locale.languageCode)
.format(DateTime.tryParse(time)!);
case '24':
return DateFormat.Hm().format(DateTime.tryParse(time)!);
return DateFormat.Hm(locale.languageCode)
.format(DateTime.tryParse(time)!);
default:
return DateFormat.Hm().format(DateTime.tryParse(time)!);
return DateFormat.Hm(locale.languageCode)
.format(DateTime.tryParse(time)!);
}
}
String getTimeFormatTz(TZDateTime time) {
switch (settings.timeformat) {
case '12':
return DateFormat.jm().format(time);
return DateFormat.jm(locale.languageCode).format(time);
case '24':
return DateFormat.Hm().format(time);
return DateFormat.Hm(locale.languageCode).format(time);
default:
return DateFormat.Hm().format(time);
return DateFormat.Hm(locale.languageCode).format(time);
}
}
}

1
lib/main.dart
View file

@ -46,6 +46,7 @@ String widgetTextColor = '';
final List appLanguages = [
{'name': 'বাংলা', 'locale': const Locale('bn', 'IN')},
{'name': 'Čeština', 'locale': const Locale('cs', 'CZ')},
{'name': 'Dansk', 'locale': const Locale('da', 'DK')},
{'name': 'Deutsch', 'locale': const Locale('de', 'DE')},
{'name': 'English', 'locale': const Locale('en', 'US')},
{'name': 'Español', 'locale': const Locale('es', 'ES')},

2
lib/translation/translation.dart
View file

@ -1,6 +1,7 @@
import 'package:get/get.dart';
import 'package:rain/translation/bn_in.dart';
import 'package:rain/translation/cs_cz.dart';
import 'package:rain/translation/da_dk.dart';
import 'package:rain/translation/de_de.dart';
import 'package:rain/translation/en_us.dart';
import 'package:rain/translation/es_es.dart';
@ -43,5 +44,6 @@ class Translation extends Translations {
'bn_IN': BnIn().messages,
'ga_IE': GaIe().messages,
'hu_HU': HuHu().messages,
'da_DK': DaDk().messages,
};
}