Merge branch 'main' into fix/locale-settings-desc

change translation key
Clarify locale settings description
2026-03-03 02:47:02 +00:00 · 2026-02-18 16:30:09 +01:00 · 2026-02-18 16:28:37 +01:00 · 2026-01-27 15:41:16 +01:00
2 changed files with 5 additions and 5 deletions
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -871,8 +871,8 @@
  "current_pin_code": "Current PIN code",
  "current_server_address": "Current server address",
  "custom_date": "Custom date",
-  "custom_locale": "Custom Locale",
-  "custom_locale_description": "Format dates and numbers based on the language and the region",
+  "custom_locale": "Custom locale",
+  "custom_locale_description": "Format dates, times, and numbers based on the selected language and region",
  "custom_url": "Custom URL",
  "cutoff_date_description": "Keep photos from the last…",
  "cutoff_day": "{count, plural, one {day} other {days}}",
@@ -895,8 +895,6 @@
  "deduplication_criteria_2": "Count of EXIF data",
  "deduplication_info": "Deduplication Info",
  "deduplication_info_description": "To automatically preselect assets and remove duplicates in bulk, we look at:",
-  "default_locale": "Default Locale",
-  "default_locale_description": "Format dates and numbers based on your browser locale",
  "delete": "Delete",
  "delete_action_confirmation_message": "Are you sure you want to delete this asset? This action will move the asset to the server's trash and will prompt if you want to delete it locally",
  "delete_action_prompt": "{count} deleted",
@@ -2328,6 +2326,8 @@
  "url": "URL",
  "usage": "Usage",
  "use_biometric": "Use biometric",
+  "use_browser_locale": "Use browser locale",
+  "use_browser_locale_description": "Format dates, times, and numbers based on your browser locale",
  "use_current_connection": "Use current connection",
  "use_custom_date_range": "Use custom date range instead",
  "user": "User",
--- a/web/src/lib/components/user-settings-page/app-settings.svelte
+++ b/web/src/lib/components/user-settings-page/app-settings.svelte
@@ -66,7 +66,7 @@

      <SettingsLanguageSelector showSettingDescription />

-      <Field label={$t('default_locale')} description={$t('default_locale_description')}>
+      <Field label={$t('use_browser_locale')} description={$t('use_browser_locale_description')}>
        <Switch checked={$locale == 'default'} onCheckedChange={handleToggleLocaleBrowser} />
        <Text size="small" class="mt-2 font-mono text-sm">{selectedDate}</Text>
      </Field>
Author	SHA1	Message	Date
Mees Frensel	083fa60377	Merge branch 'main' into fix/locale-settings-desc	2026-02-18 16:30:09 +01:00
Mees Frensel	6c02967eb1	change translation key	2026-02-18 16:28:37 +01:00
Mees Frensel	1304abac92	Clarify locale settings description	2026-01-27 15:41:16 +01:00