Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

fix(cloud): preserve complete localized guidance and language quality

Timothy Yin6c59edba4fd7
diff --git a/apps/cloud/app/components/CloudPhotoLibrary.vue b/apps/cloud/app/components/CloudPhotoLibrary.vue
index 2885d795..e290cbdf 100644
--- a/apps/cloud/app/components/CloudPhotoLibrary.vue
+++ b/apps/cloud/app/components/CloudPhotoLibrary.vue
@@ -379,7 +379,7 @@ watch(
)
}}</strong
><span
- >{{ $t('cloud.messages.attempt') }}{{ job.attempts
+ >{{ $t('cloud.ui.attemptCount', { count: job.attempts })
}}<template v-if="job.error_code">
·
{{
diff --git a/apps/cloud/app/components/CloudSecuritySettings.vue b/apps/cloud/app/components/CloudSecuritySettings.vue
index 1c82f3d3..4025c3d3 100644
--- a/apps/cloud/app/components/CloudSecuritySettings.vue
+++ b/apps/cloud/app/components/CloudSecuritySettings.vue
@@ -147,7 +147,7 @@ async function deletePasskey(id: number) {
{{ $t('cloud.messages.security') }}
</h2>
<p class="cf-page-description">
- {{ $t('cloud.ui.securityFor', { email: security?.email || '' }) }}.
+ {{ $t('cloud.ui.securityFor', { email: security?.email || '' }) }}
</p>
</div>
</div>
@@ -205,16 +205,22 @@ async function deletePasskey(id: number) {
>{{ $t('cloud.messages.updatePassword') }}</CloudButton
>
</form>
- <p v-else>
- {{ $t('cloud.messages.youSignedInWithAnEmailCode')
- }}<NuxtLink
- class="cf-text-link"
- to="/forgot-password"
- >{{
- $t('cloud.messages.emailYourselfALinkToSetAPassword')
- }}</NuxtLink
- >{{ $t('cloud.messages.beforeEnablingTwoStepVerification') }}
- </p>
+ <i18n-t
+ v-else
+ keypath="cloud.ui.passwordSetupGuidance"
+ tag="p"
+ scope="global"
+ >
+ <template #link
+ ><NuxtLink
+ class="cf-text-link"
+ to="/forgot-password"
+ >{{
+ $t('cloud.messages.emailYourselfALinkToSetAPassword')
+ }}</NuxtLink
+ ></template
+ >
+ </i18n-t>
</div></CloudCard
>
<CloudCard class="cf-security-card"
diff --git a/apps/cloud/app/components/CloudSitePublication.vue b/apps/cloud/app/components/CloudSitePublication.vue
index 47762f52..1dfa968f 100644
--- a/apps/cloud/app/components/CloudSitePublication.vue
+++ b/apps/cloud/app/components/CloudSitePublication.vue
@@ -150,19 +150,16 @@ async function unpublish() {
v-if="!context?.published"
class="cf-draft-hint"
>
- {{ $t('cloud.messages.thisAddressReturns404UntilYouPublishYourGallery')
- }}{{
- loading
- ? $t('cloud.messages.checkingPhotographs')
- : !photos.length
- ? $t(
- 'cloud.messages.uploadAPhotographAndWaitForProcessingToFinish',
- )
- : admin
- ? $t('cloud.messages.readyToShareSelectPublishGalleryAbove')
- : $t(
- 'cloud.messages.askAWorkspaceAdministratorToPublishThisGallery',
- )
+ {{
+ $t(
+ loading
+ ? 'cloud.ui.draftChecking'
+ : !photos.length
+ ? 'cloud.ui.draftNeedsPhoto'
+ : admin
+ ? 'cloud.ui.draftReady'
+ : 'cloud.ui.draftAskAdmin',
+ )
}}
</p>
<p
diff --git a/apps/cloud/app/components/CloudUploadDrawer.vue b/apps/cloud/app/components/CloudUploadDrawer.vue
index 47412b75..5845ceb4 100644
--- a/apps/cloud/app/components/CloudUploadDrawer.vue
+++ b/apps/cloud/app/components/CloudUploadDrawer.vue
@@ -55,18 +55,22 @@ async function dropFiles(event: DragEvent) {
class="w-full"
:disabled="uploading"
/></UFormField>
- <p
+ <i18n-t
v-if="!connections.length"
+ keypath="cloud.ui.connectStorageGuidance"
+ tag="p"
+ scope="global"
class="text-sm text-muted"
>
- {{ $t('cloud.messages.connectYourPrivateStorageIn')
- }}<NuxtLink
- :to="`/sites/${context?.siteId}/storage`"
- class="underline"
- @click="uploadOpen = false"
- >{{ $t('cloud.messages.storage') }}</NuxtLink
- >{{ $t('cloud.messages.beforeUploading') }}
- </p>
+ <template #link
+ ><NuxtLink
+ :to="`/sites/${context?.siteId}/storage`"
+ class="underline"
+ @click="uploadOpen = false"
+ >{{ $t('cloud.messages.storage') }}</NuxtLink
+ ></template
+ >
+ </i18n-t>
<input
ref="input"
class="sr-only"
diff --git a/apps/cloud/i18n/locale.ts b/apps/cloud/i18n/locale.ts
index ca6fa97a..153a59e7 100644
--- a/apps/cloud/i18n/locale.ts
+++ b/apps/cloud/i18n/locale.ts
@@ -6,7 +6,9 @@ export function resolveCloudLocale(acceptLanguage: string): CloudLocale {
.split(',')
.map((part, index) => {
const [range = '', ...parameters] = part.trim().split(';')
- const quality = parameters.find((value) => value.trim().startsWith('q='))
+ const quality = parameters.find((value) =>
+ value.trim().toLowerCase().startsWith('q='),
+ )
const weight = quality === undefined ? 1 : Number(quality.trim().slice(2))
return { range: range.toLowerCase(), weight, index }
})
diff --git a/apps/cloud/i18n/locales/en.json b/apps/cloud/i18n/locales/en.json
index 30f374ee..6490e172 100644
--- a/apps/cloud/i18n/locales/en.json
+++ b/apps/cloud/i18n/locales/en.json
@@ -434,7 +434,7 @@
"selectedCount": "{count} selected",
"photographCount": "{count} photograph | {count} photographs",
"photoMembershipCount": "Photographs · {count}",
- "securityFor": "Manage sign-in methods for {email}",
+ "securityFor": "Manage sign-in methods for {email}.",
"uploadProgress": "{progress}% · Uploading to your private bucket",
"uploadUsage": "{photos} / 1,000 photographs · {bytes} / 5 GiB uploaded in 30 days",
"connectionRevision": "{bucket} · revision {revision}",
@@ -448,7 +448,14 @@
"cancelled": "Cancelled",
"unknownJob": "Processing status unavailable",
"deletePhotosCount": "Delete {count} photograph | Delete {count} photographs",
- "processingFailure": "Processing could not finish ({code}). Retry or contact the operator."
+ "processingFailure": "Processing could not finish ({code}). Retry or contact the operator.",
+ "draftChecking": "This address returns 404 until you publish your gallery. Checking photographs…",
+ "draftNeedsPhoto": "This address returns 404 until you publish your gallery. Upload a photograph and wait for processing to finish before publishing.",
+ "draftReady": "This address returns 404 until you publish your gallery. Ready to share? Select Publish gallery above.",
+ "draftAskAdmin": "This address returns 404 until you publish your gallery. Ask a workspace administrator to publish this gallery.",
+ "passwordSetupGuidance": "You signed in with an email code. {link} before enabling two-step verification.",
+ "connectStorageGuidance": "Connect your private storage in {link} before uploading.",
+ "attemptCount": "Attempt {count}"
},
"storageErrors": {
"storage_configuration_failed": "Check the S3 endpoint, region, bucket name and credential fields.",
diff --git a/apps/cloud/i18n/locales/zh-Hans.json b/apps/cloud/i18n/locales/zh-Hans.json
index e5adb5be..bc0e84cb 100644
--- a/apps/cloud/i18n/locales/zh-Hans.json
+++ b/apps/cloud/i18n/locales/zh-Hans.json
@@ -434,7 +434,7 @@
"selectedCount": "已选择 {count} 项",
"photographCount": "{count} 张照片",
"photoMembershipCount": "照片 · {count}",
- "securityFor": "管理 {email} 的登录方式",
+ "securityFor": "管理 {email} 的登录方式。",
"uploadProgress": "{progress}% · 正在上传到你的私有存储桶",
"uploadUsage": "{photos} / 1,000 张照片 · {bytes} / 5 GiB(近 30 天上传量)",
"connectionRevision": "{bucket} · 凭证版本 {revision}",
@@ -448,7 +448,14 @@
"cancelled": "已取消",
"unknownJob": "处理状态暂不可用",
"deletePhotosCount": "删除 {count} 张照片",
- "processingFailure": "处理未能完成({code}),请重试或联系平台管理员。"
+ "processingFailure": "处理未能完成({code}),请重试或联系平台管理员。",
+ "draftChecking": "发布图库之前,访问此地址将返回 404。正在检查照片…",
+ "draftNeedsPhoto": "发布图库之前,访问此地址将返回 404。请先上传照片,等待处理完成后再发布。",
+ "draftReady": "发布图库之前,访问此地址将返回 404。准备好分享了吗?点击上方的“发布图库”。",
+ "draftAskAdmin": "发布图库之前,访问此地址将返回 404。请联系工作区管理员发布此图库。",
+ "passwordSetupGuidance": "你使用邮箱验证码登录。请先{link},再启用两步验证。",
+ "connectStorageGuidance": "上传前,请先在{link}中连接私有存储。",
+ "attemptCount": "尝试次数 {count}"
},
"storageErrors": {
"storage_configuration_failed": "请检查 S3 服务端点、区域、存储桶名称和凭证字段。",
diff --git a/tests/cloud-i18n.test.ts b/tests/cloud-i18n.test.ts
index 2f74be52..443ee366 100644
--- a/tests/cloud-i18n.test.ts
+++ b/tests/cloud-i18n.test.ts
@@ -38,6 +38,8 @@ test('Cloud negotiates English and simplified Chinese by browser preference and
'ja,fr;q=0.8',
'en-GB,zh;q=0.5',
'zh;q=0,en-US;q=0.1',
+ 'zh;Q=0,en;q=0.8',
+ 'zh;Q=0.1,en;Q=0.9',
'zh;q=invalid,en',
'zh;q=2,en',
'zh;q=0.5,en;q=0.9',