From d363d544d6d754c75994f9cdff7add78ba574745 Mon Sep 17 00:00:00 2001 From: Ming Ming Date: Sat, 23 Nov 2024 13:54:22 +0800 Subject: [PATCH] Update messaging for server side metadata support --- app/lib/l10n/app_en.arb | 12 +++-- app/lib/l10n/untranslated-messages.txt | 48 +++++++++++++++++-- .../widget/settings/metadata_settings.dart | 13 +++-- app/lib/widget/setup.dart | 7 ++- 4 files changed, 69 insertions(+), 11 deletions(-) diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb index 0f703d68..b73ad4ee 100644 --- a/app/lib/l10n/app_en.arb +++ b/app/lib/l10n/app_en.arb @@ -274,8 +274,8 @@ "@settingsMetadataTitle": { "description": "Metadata (e.g., date, resolution, GPS, etc)" }, - "settingsExifSupportTitle": "EXIF support", - "@settingsExifSupportTitle": { + "settingsExifSupportTitle2": "Client side EXIF support", + "@settingsExifSupportTitle2": { "description": "Title of the EXIF support setting" }, "settingsExifSupportTrueSubtitle": "Require extra network usage", @@ -501,8 +501,12 @@ "@exifSupportDetails": { "description": "Detailed description of the exif support feature" }, - "exifSupportConfirmationDialogTitle": "Enable EXIF support?", - "@exifSupportConfirmationDialogTitle": { + "exifSupportNextcloud28Notes": "Client side support complements your server. The app will process files and attributes not supported by Nextcloud", + "@exifSupportNextcloud28Notes": { + "description": "Extra notes for Nextcloud 28+" + }, + "exifSupportConfirmationDialogTitle2": "Enable client side EXIF support?", + "@exifSupportConfirmationDialogTitle2": { "description": "Title of the dialog to confirm enabling exif support" }, "captureLogDetails": "To take logs for a bug report:\n\n1. Enable this setting\n2. Reproduce the issue\n3. Disable this setting\n4. Look for nc-photos.log in the download folder\n\n*If the issue causes the app to crash, no logs could be captured. In such case, please contact the developer for further instructions", diff --git a/app/lib/l10n/untranslated-messages.txt b/app/lib/l10n/untranslated-messages.txt index 262fcee0..09465826 100644 --- a/app/lib/l10n/untranslated-messages.txt +++ b/app/lib/l10n/untranslated-messages.txt @@ -1,6 +1,7 @@ { "ca": [ "settingsMetadataTitle", + "settingsExifSupportTitle2", "settingsShareFolderPickerDescription", "settingsPersonProviderTitle", "settingsServerAppSectionTitle", @@ -55,7 +56,8 @@ "writePreferenceFailureNotification", "enableButtonLabel", "exifSupportDetails", - "exifSupportConfirmationDialogTitle", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "captureLogDetails", "captureLogSuccessNotification", "doneButtonLabel", @@ -281,9 +283,12 @@ ], "cs": [ + "settingsExifSupportTitle2", "settingsViewerCustomizeAppBarTitle", "settingsViewerCustomizeBottomAppBarTitle", "settingsCollectionsCustomizeNavigationBarTitle", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "alternativeSignIn", "livePhotoTooltip", "dragAndDropRearrangeButtons", @@ -294,9 +299,12 @@ ], "de": [ + "settingsExifSupportTitle2", "settingsViewerCustomizeAppBarTitle", "settingsViewerCustomizeBottomAppBarTitle", "settingsCollectionsCustomizeNavigationBarTitle", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "alternativeSignIn", "livePhotoTooltip", "dragAndDropRearrangeButtons", @@ -313,6 +321,7 @@ "signInHeaderText2", "settingsLanguageOptionSystemDefaultLabel", "settingsMetadataTitle", + "settingsExifSupportTitle2", "settingsExifWifiOnlyTitle", "settingsExifWifiOnlyFalseSubtitle", "settingsAccountLabelTitle", @@ -359,6 +368,8 @@ "settingsUseNewHttpEngineDescription", "settingsServerVersionTitle", "settingsRestartNeededDialog", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "slideshowSetupDialogReverseTitle", "shareMethodPreviewTitle", "shareMethodPreviewDescription", @@ -465,9 +476,12 @@ ], "es": [ + "settingsExifSupportTitle2", "settingsViewerCustomizeAppBarTitle", "settingsViewerCustomizeBottomAppBarTitle", "settingsCollectionsCustomizeNavigationBarTitle", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "alternativeSignIn", "livePhotoTooltip", "dragAndDropRearrangeButtons", @@ -478,6 +492,7 @@ ], "fi": [ + "settingsExifSupportTitle2", "settingsViewerCustomizeAppBarTitle", "settingsViewerCustomizeBottomAppBarTitle", "settingsCollectionsCustomizeNavigationBarTitle", @@ -498,6 +513,8 @@ "settingsUseNewHttpEngine", "settingsUseNewHttpEngineDescription", "settingsRestartNeededDialog", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "appLockUnlockHint", "appLockUnlockWrongPassword", "enabledText", @@ -527,6 +544,7 @@ ], "fr": [ + "settingsExifSupportTitle2", "settingsViewerCustomizeAppBarTitle", "settingsViewerCustomizeBottomAppBarTitle", "settingsCollectionsCustomizeNavigationBarTitle", @@ -547,6 +565,8 @@ "settingsUseNewHttpEngine", "settingsUseNewHttpEngineDescription", "settingsRestartNeededDialog", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "appLockUnlockHint", "appLockUnlockWrongPassword", "enabledText", @@ -576,6 +596,7 @@ ], "it": [ + "settingsExifSupportTitle2", "settingsPersonProviderTitle", "settingsViewerCustomizeAppBarTitle", "settingsViewerCustomizeBottomAppBarTitle", @@ -598,6 +619,8 @@ "settingsUseNewHttpEngine", "settingsUseNewHttpEngineDescription", "settingsRestartNeededDialog", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "unmuteTooltip", "slideshowTooltip", "enhanceColorPopTitle", @@ -657,7 +680,7 @@ "settingsLanguageTitle", "settingsLanguageOptionSystemDefaultLabel", "settingsMetadataTitle", - "settingsExifSupportTitle", + "settingsExifSupportTitle2", "settingsExifSupportTrueSubtitle", "settingsExifWifiOnlyTitle", "settingsExifWifiOnlyFalseSubtitle", @@ -744,7 +767,8 @@ "writePreferenceFailureNotification", "enableButtonLabel", "exifSupportDetails", - "exifSupportConfirmationDialogTitle", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "captureLogDetails", "captureLogSuccessNotification", "doneButtonLabel", @@ -1028,6 +1052,7 @@ ], "pl": [ + "settingsExifSupportTitle2", "settingsMemoriesRangeValueText", "settingsViewerCustomizeAppBarTitle", "settingsViewerCustomizeBottomAppBarTitle", @@ -1049,6 +1074,8 @@ "settingsUseNewHttpEngine", "settingsUseNewHttpEngineDescription", "settingsRestartNeededDialog", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "enhanceColorPopTitle", "imageEditTransformOrientationClockwise", "imageEditTransformOrientationCounterclockwise", @@ -1083,6 +1110,7 @@ "pt": [ "nameInputInvalidEmpty", "settingsMetadataTitle", + "settingsExifSupportTitle2", "settingsPersonProviderTitle", "settingsViewerCustomizeAppBarTitle", "settingsViewerCustomizeBottomAppBarTitle", @@ -1107,6 +1135,8 @@ "settingsUseNewHttpEngineDescription", "settingsServerVersionTitle", "settingsRestartNeededDialog", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "searchLandingPeopleListEmptyText2", "createCollectionFailureNotification", "addItemToCollectionTooltip", @@ -1150,6 +1180,7 @@ ], "ru": [ + "settingsExifSupportTitle2", "settingsViewerCustomizeAppBarTitle", "settingsViewerCustomizeBottomAppBarTitle", "settingsCollectionsCustomizeNavigationBarTitle", @@ -1170,6 +1201,8 @@ "settingsUseNewHttpEngine", "settingsUseNewHttpEngineDescription", "settingsRestartNeededDialog", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "appLockUnlockHint", "appLockUnlockWrongPassword", "enabledText", @@ -1199,9 +1232,12 @@ ], "tr": [ + "settingsExifSupportTitle2", "settingsViewerCustomizeAppBarTitle", "settingsViewerCustomizeBottomAppBarTitle", "settingsCollectionsCustomizeNavigationBarTitle", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "alternativeSignIn", "livePhotoTooltip", "dragAndDropRearrangeButtons", @@ -1213,6 +1249,7 @@ "zh": [ "settingsMetadataTitle", + "settingsExifSupportTitle2", "settingsPersonProviderTitle", "settingsMemoriesRangeValueText", "settingsViewerCustomizeAppBarTitle", @@ -1239,6 +1276,8 @@ "settingsUseNewHttpEngine", "settingsUseNewHttpEngineDescription", "settingsRestartNeededDialog", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "slideshowSetupDialogReverseTitle", "enhanceColorPopTitle", "enhanceRetouchTitle", @@ -1298,6 +1337,7 @@ "signInHeaderText2", "settingsLanguageOptionSystemDefaultLabel", "settingsMetadataTitle", + "settingsExifSupportTitle2", "settingsExifWifiOnlyTitle", "settingsExifWifiOnlyFalseSubtitle", "settingsAccountLabelTitle", @@ -1347,6 +1387,8 @@ "settingsUseNewHttpEngineDescription", "settingsServerVersionTitle", "settingsRestartNeededDialog", + "exifSupportNextcloud28Notes", + "exifSupportConfirmationDialogTitle2", "sortOptionFilenameAscendingLabel", "sortOptionFilenameDescendingLabel", "slideshowSetupDialogReverseTitle", diff --git a/app/lib/widget/settings/metadata_settings.dart b/app/lib/widget/settings/metadata_settings.dart index 98982b57..c4ebdec7 100644 --- a/app/lib/widget/settings/metadata_settings.dart +++ b/app/lib/widget/settings/metadata_settings.dart @@ -77,7 +77,7 @@ class _WrappedMetadataSettingsState extends State<_WrappedMetadataSettings> selector: (state) => state.isEnable, builder: (context, state) { return SwitchListTile( - title: Text(L10n.global().settingsExifSupportTitle), + title: Text(L10n.global().settingsExifSupportTitle2), subtitle: state ? Text( L10n.global().settingsExifSupportTrueSubtitle) @@ -122,8 +122,15 @@ class _WrappedMetadataSettingsState extends State<_WrappedMetadataSettings> final result = await showDialog( context: context, builder: (context) => AlertDialog( - title: Text(L10n.global().exifSupportConfirmationDialogTitle), - content: Text(L10n.global().exifSupportDetails), + title: Text(L10n.global().exifSupportConfirmationDialogTitle2), + content: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text(L10n.global().exifSupportDetails), + const SizedBox(height: 16), + Text(L10n.global().exifSupportNextcloud28Notes), + ], + ), actions: [ TextButton( onPressed: () { diff --git a/app/lib/widget/setup.dart b/app/lib/widget/setup.dart index 6cc8c52d..26e0b137 100644 --- a/app/lib/widget/setup.dart +++ b/app/lib/widget/setup.dart @@ -150,7 +150,7 @@ class _ExifState extends State<_Exif> { crossAxisAlignment: CrossAxisAlignment.start, children: [ SwitchListTile( - title: Text(L10n.global().settingsExifSupportTitle), + title: Text(L10n.global().settingsExifSupportTitle2), value: _isEnableExif, onChanged: _onValueChanged, ), @@ -160,6 +160,11 @@ class _ExifState extends State<_Exif> { child: Text(L10n.global().exifSupportDetails), ), const SizedBox(height: 16), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Text(L10n.global().exifSupportNextcloud28Notes), + ), + const SizedBox(height: 16), Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Text(