beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge one more string

Browse source
This commit is contained in:
vishnukvmd 2023-04-08 09:51:46 +05:30
parent 345cc69b94
commit 1a22a6e99d
4 changed files with 45 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/generated/intl/messages_en.dart
View file

@ -731,10 +731,6 @@ class MessageLookup extends MessageLookupByLibrary {
"noExifData": MessageLookupByLibrary.simpleMessage("No EXIF data"),
"noHiddenPhotosOrVideos":
MessageLookupByLibrary.simpleMessage("No hidden photos or videos"),
"noPasswordWarningPart1": MessageLookupByLibrary.simpleMessage(
"We don\'t store this password, so if you forget,"),
"noPasswordWarningPart2":
MessageLookupByLibrary.simpleMessage("we cannot decrypt your data"),
"noPhotosAreBeingBackedUpRightNow":
MessageLookupByLibrary.simpleMessage(
"No photos are being backed up right now"),
@ -761,6 +757,8 @@ class MessageLookup extends MessageLookupByLibrary {
"Password changed successfully"),
"passwordLock": MessageLookupByLibrary.simpleMessage("Password lock"),
"passwordStrength": m28,
"passwordWarning": MessageLookupByLibrary.simpleMessage(
"We don\'t store this password, so if you forget, <underline>we cannot decrypt your data</underline>"),
"paymentDetails":
MessageLookupByLibrary.simpleMessage("Payment details"),
"paymentFailed": MessageLookupByLibrary.simpleMessage("Payment failed"),

22
lib/generated/l10n.dart
View file

@ -620,24 +620,12 @@ class S {
);
}
/// `We don't store this password, so if you forget,`
String get noPasswordWarningPart1 {
/// `We don't store this password, so if you forget, <underline>we cannot decrypt your data</underline>`
String get passwordWarning {
return Intl.message(
'We don\'t store this password, so if you forget,',
name: 'noPasswordWarningPart1',
desc:
'This text is part1 the sentence \'We don\'t store this password, so if you forget, we cannot decrypt your data.\'',
args: [],
);
}
/// `we cannot decrypt your data`
String get noPasswordWarningPart2 {
return Intl.message(
'we cannot decrypt your data',
name: 'noPasswordWarningPart2',
desc:
'This text is part2 the sentence \'We don\'t store this password, so if you forget, we cannot decrypt your data.\'',
'We don\'t store this password, so if you forget, <underline>we cannot decrypt your data</underline>',
name: 'passwordWarning',
desc: '',
args: [],
);
}

9
lib/l10n/intl_en.arb
View file

@ -56,14 +56,7 @@
"changePasswordTitle": "Change password",
"resetPasswordTitle": "Reset password",
"encryptionKeys": "Encryption keys",
"noPasswordWarningPart1": "We don't store this password, so if you forget,",
"@noPasswordWarningPart1": {
"description": "This text is part1 the sentence 'We don't store this password, so if you forget, we cannot decrypt your data.'"
},
"noPasswordWarningPart2": "we cannot decrypt your data",
"@noPasswordWarningPart2": {
"description": "This text is part2 the sentence 'We don't store this password, so if you forget, we cannot decrypt your data.'"
},
"passwordWarning": "We don't store this password, so if you forget, <underline>we cannot decrypt your data</underline>",
"enterPasswordToEncrypt": "Enter a password we can use to encrypt your data",
"enterNewPasswordToEncrypt": "Enter a new password we can use to encrypt your data",
"weakStrength": "Weak",

57
lib/ui/account/password_entry_page.dart
View file

@ -15,6 +15,7 @@ import 'package:photos/ui/payment/subscription.dart';
import 'package:photos/utils/dialog_util.dart';
import 'package:photos/utils/navigation_util.dart';
import 'package:photos/utils/toast_util.dart';
import "package:styled_text/styled_text.dart";
enum PasswordEntryMode {
set,
@ -173,27 +174,43 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
const Padding(padding: EdgeInsets.all(8)),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 20),
child: RichText(
text: TextSpan(
style: Theme.of(context)
.textTheme
.subtitle1!
.copyWith(fontSize: 14),
children: [
TextSpan(
text: '${S.of(context).noPasswordWarningPart1} ',
),
TextSpan(
text: S.of(context).noPasswordWarningPart2,
style:
Theme.of(context).textTheme.subtitle1!.copyWith(
fontSize: 14,
decoration: TextDecoration.underline,
),
),
],
),
child: StyledText(
text: S.of(context).passwordWarning,
style: Theme.of(context)
.textTheme
.subtitle1!
.copyWith(fontSize: 14),
tags: {
'underline': StyledTextTag(
style: Theme.of(context).textTheme.subtitle1!.copyWith(
fontSize: 14,
decoration: TextDecoration.underline,
),
),
},
),
// RichText(
// text: TextSpan(
// style: Theme.of(context)
// .textTheme
// .subtitle1!
// .copyWith(fontSize: 14),
// children: [
// TextSpan(
// text: '${S.of(context).noPasswordWarningPart1} ',
// ),
// TextSpan(
// text: S.of(context).noPasswordWarningPart2,
// style:
// Theme.of(context).textTheme.subtitle1!.copyWith(
// fontSize: 14,
// decoration: TextDecoration.underline,
// ),
// ),
// ],
// ),
// ),
),
const Padding(padding: EdgeInsets.all(12)),
Visibility(