Fix localized merge prompts and quota windows

This commit is contained in:
Jinjing
2026-11-09 23:19:17 -08:00
parent 55bddb4bb2
commit cf406f6644
16 changed files with 141 additions and 41 deletions
+6
View File
@@ -3365,6 +3365,12 @@
},
"tasks": {
"hostedMerge": {
"confirmGitHubMerge": "PR #{{number}} zusammenführen?",
"confirmGitHubSquash": "PR #{{number}} mit Squash zusammenführen?",
"confirmGitHubRebase": "PR #{{number}} mit Rebase zusammenführen?",
"confirmGitLabMerge": "Merge Request #{{number}} zusammenführen?",
"confirmGitLabSquash": "Merge Request #{{number}} mit Squash zusammenführen?",
"confirmGitLabRebase": "Merge Request #{{number}} mit Rebase zusammenführen?",
"merged": "Zusammengeführt",
"closed": "Geschlossen",
"conflicts": "Konflikte",
+6
View File
@@ -4533,6 +4533,12 @@
"createFailed": "Failed to create workspace"
},
"hostedMerge": {
"confirmGitHubMerge": "Merge PR #{{number}}?",
"confirmGitHubSquash": "Squash and merge PR #{{number}}?",
"confirmGitHubRebase": "Rebase and merge PR #{{number}}?",
"confirmGitLabMerge": "Merge merge request #{{number}}?",
"confirmGitLabSquash": "Squash and merge merge request #{{number}}?",
"confirmGitLabRebase": "Rebase and merge merge request #{{number}}?",
"merged": "Merged",
"closed": "Closed",
"conflicts": "Conflicts",
+6
View File
@@ -3453,6 +3453,12 @@
},
"tasks": {
"hostedMerge": {
"confirmGitHubMerge": "¿Fusionar el PR #{{number}}?",
"confirmGitHubSquash": "¿Compactar y fusionar el PR #{{number}}?",
"confirmGitHubRebase": "¿Hacer rebase y fusionar el PR #{{number}}?",
"confirmGitLabMerge": "¿Fusionar la solicitud de merge #{{number}}?",
"confirmGitLabSquash": "¿Compactar y fusionar la solicitud de merge #{{number}}?",
"confirmGitLabRebase": "¿Hacer rebase y fusionar la solicitud de merge #{{number}}?",
"merged": "Fusionado",
"closed": "Cerrado",
"conflicts": "Conflictos",
+6
View File
@@ -3453,6 +3453,12 @@
},
"tasks": {
"hostedMerge": {
"confirmGitHubMerge": "Fusionner la PR nº {{number}} ?",
"confirmGitHubSquash": "Compresser les commits et fusionner la PR nº {{number}} ?",
"confirmGitHubRebase": "Rebaser et fusionner la PR nº {{number}} ?",
"confirmGitLabMerge": "Fusionner la demande de fusion nº {{number}} ?",
"confirmGitLabSquash": "Compresser les commits et fusionner la demande de fusion nº {{number}} ?",
"confirmGitLabRebase": "Rebaser et fusionner la demande de fusion nº {{number}} ?",
"merged": "Fusionné",
"closed": "Fermé",
"conflicts": "Conflits",
+6
View File
@@ -3441,6 +3441,12 @@
"openView": "GitHub でビューを開く"
},
"hostedMerge": {
"confirmGitHubMerge": "PR #{{number}} をマージしますか?",
"confirmGitHubSquash": "PR #{{number}} のコミットをまとめてマージしますか?",
"confirmGitHubRebase": "PR #{{number}} をリベースしてマージしますか?",
"confirmGitLabMerge": "マージリクエスト #{{number}} をマージしますか?",
"confirmGitLabSquash": "マージリクエスト #{{number}} のコミットをまとめてマージしますか?",
"confirmGitLabRebase": "マージリクエスト #{{number}} をリベースしてマージしますか?",
"merged": "マージ済み",
"closed": "クローズ済み",
"conflicts": "競合あり",
+6
View File
@@ -3361,6 +3361,12 @@
},
"tasks": {
"hostedMerge": {
"confirmGitHubMerge": "PR #{{number}}을(를) 병합하시겠습니까?",
"confirmGitHubSquash": "PR #{{number}}의 커밋을 합쳐서 병합하시겠습니까?",
"confirmGitHubRebase": "PR #{{number}}을(를) 리베이스한 후 병합하시겠습니까?",
"confirmGitLabMerge": "병합 요청 #{{number}}을(를) 병합하시겠습니까?",
"confirmGitLabSquash": "병합 요청 #{{number}}의 커밋을 합쳐서 병합하시겠습니까?",
"confirmGitLabRebase": "병합 요청 #{{number}}을(를) 리베이스한 후 병합하시겠습니까?",
"merged": "병합됨",
"closed": "닫힘",
"conflicts": "충돌",
+6 -15
View File
@@ -3976,21 +3976,6 @@
}
},
"tasks": {
"hostedMerge": {
"merged": "Mesclado",
"closed": "Fechado",
"conflicts": "Conflitos",
"behind": "Desatualizado",
"blocked": "Bloqueado",
"checksPending": "Verificações pendentes",
"ableToMerge": "Pode ser mesclado",
"unknown": "Desconhecido"
},
"pagination": {
"pageUnreachable": "A página {{page}} está além do que a pesquisa do GitHub pode retornar.",
"loadPageFailed": "A página {{page}} não pôde ser carregada do GitHub.",
"noMoreResults": "Não há mais resultados na página {{page}}."
},
"composerSource": {
"baseFailed": "Falha ao determinar a branch base.",
"forkPushWarning": "Este PR está com \"Permitir edições de mantenedores\" desativado; o GitHub pode rejeitar o push para o fork."
@@ -4545,6 +4530,12 @@
"createFailed": "Falha ao criar espaço de trabalho"
},
"hostedMerge": {
"confirmGitHubMerge": "Mesclar PR #{{number}}?",
"confirmGitHubSquash": "Fazer squash e mesclar o PR #{{number}}?",
"confirmGitHubRebase": "Fazer rebase e mesclar PR #{{number}}?",
"confirmGitLabMerge": "Mesclar o merge request #{{number}}?",
"confirmGitLabSquash": "Fazer squash e mesclar o merge request #{{number}}?",
"confirmGitLabRebase": "Fazer rebase e mesclar o merge request #{{number}}?",
"merged": "Mesclado",
"closed": "Fechado",
"conflicts": "Conflitos",
+6
View File
@@ -3541,6 +3541,12 @@
},
"tasks": {
"hostedMerge": {
"confirmGitHubMerge": "Слить PR #{{number}}?",
"confirmGitHubSquash": "Объединить коммиты и слить PR #{{number}}?",
"confirmGitHubRebase": "Выполнить rebase и слить PR #{{number}}?",
"confirmGitLabMerge": "Слить запрос на слияние #{{number}}?",
"confirmGitLabSquash": "Объединить коммиты и слить запрос на слияние #{{number}}?",
"confirmGitLabRebase": "Выполнить rebase и слить запрос на слияние #{{number}}?",
"merged": "Слито",
"closed": "Закрыто",
"conflicts": "Конфликты",
+6
View File
@@ -3365,6 +3365,12 @@
},
"tasks": {
"hostedMerge": {
"confirmGitHubMerge": "PR #{{number}} birleştirilsin mi?",
"confirmGitHubSquash": "PR #{{number}} commit’leri squash edilerek birleştirilsin mi?",
"confirmGitHubRebase": "PR #{{number}} yeniden temellendirilip birleştirilsin mi?",
"confirmGitLabMerge": "Birleştirme isteği #{{number}} birleştirilsin mi?",
"confirmGitLabSquash": "Birleştirme isteği #{{number}} commit’leri squash edilerek birleştirilsin mi?",
"confirmGitLabRebase": "Birleştirme isteği #{{number}} yeniden temellendirilip birleştirilsin mi?",
"merged": "Birleştirildi",
"closed": "Kapatıldı",
"conflicts": "Çakışmalar",
+6
View File
@@ -3361,6 +3361,12 @@
},
"tasks": {
"hostedMerge": {
"confirmGitHubMerge": "要合併 PR #{{number}} 嗎?",
"confirmGitHubSquash": "要將 PR #{{number}} 的提交壓縮後合併嗎?",
"confirmGitHubRebase": "要將 PR #{{number}} 變基後合併嗎?",
"confirmGitLabMerge": "要合併合併請求 #{{number}} 嗎?",
"confirmGitLabSquash": "要將合併請求 #{{number}} 的提交壓縮後合併嗎?",
"confirmGitLabRebase": "要將合併請求 #{{number}} 變基後合併嗎?",
"merged": "已合併",
"closed": "已關閉",
"conflicts": "有衝突",
+6
View File
@@ -3450,6 +3450,12 @@
"openView": "在 GitHub 中打开视图"
},
"hostedMerge": {
"confirmGitHubMerge": "合并 PR #{{number}}?",
"confirmGitHubSquash": "压缩提交并合并 PR #{{number}}?",
"confirmGitHubRebase": "变基并合并 PR #{{number}}?",
"confirmGitLabMerge": "要将合并请求 #{{number}} 合并吗?",
"confirmGitLabSquash": "要将合并请求 #{{number}} 的提交压缩后合并吗?",
"confirmGitLabRebase": "要将合并请求 #{{number}} 变基后合并吗?",
"merged": "已合并",
"closed": "已关闭",
"conflicts": "有冲突",
+37 -18
View File
@@ -1,7 +1,6 @@
import { getHostedMergeLabel } from './mobile-hosted-check-status'
import { projectRowType } from './mobile-tasks-item-mapping'
import type {
HostedReviewItem,
HostedReviewMergeMethod,
PendingHostedMerge,
PendingHostedStateChange,
@@ -149,29 +148,49 @@ export function getHostedReviewMergeMethodLabel(method: HostedReviewMergeMethod)
)
}
export function hostedReviewMergeTargetLabel(item: HostedReviewItem): string {
return item.provider === 'gitlab' ? 'merge request' : 'PR'
function mergeConfirmMessage(
provider: 'github' | 'gitlab',
method: HostedReviewMergeMethod,
number: number | null
): string {
if (provider === 'gitlab') {
if (method === 'squash') {
return translate(
'tasks.hostedMerge.confirmGitLabSquash',
'Squash and merge merge request #{{number}}?',
{ number }
)
}
if (method === 'rebase') {
return translate(
'tasks.hostedMerge.confirmGitLabRebase',
'Rebase and merge merge request #{{number}}?',
{ number }
)
}
return translate('tasks.hostedMerge.confirmGitLabMerge', 'Merge merge request #{{number}}?', {
number
})
}
if (method === 'squash') {
return translate('tasks.hostedMerge.confirmGitHubSquash', 'Squash and merge PR #{{number}}?', {
number
})
}
if (method === 'rebase') {
return translate('tasks.hostedMerge.confirmGitHubRebase', 'Rebase and merge PR #{{number}}?', {
number
})
}
return translate('tasks.hostedMerge.confirmGitHubMerge', 'Merge PR #{{number}}?', { number })
}
export function getHostedMergeConfirmMessage(pending: PendingHostedMerge): string {
const target = hostedReviewMergeTargetLabel(pending.item)
if (pending.method === 'squash') {
return `${translate(GITHUB_PR_MERGE_METHOD_I18N_KEYS.squash, 'Squash and merge')} ${target} #${pending.item.source.number}?`
}
const action =
pending.method === 'rebase'
? translate(GITHUB_PR_MERGE_METHOD_I18N_KEYS.rebase, 'Rebase and merge')
: translate(GITHUB_PR_MERGE_METHOD_I18N_KEYS.merge, 'Merge')
return `${action} ${target} #${pending.item.source.number}?`
return mergeConfirmMessage(pending.item.provider, pending.method, pending.item.source.number)
}
export function getProjectGitHubMergeConfirmMessage(pending: PendingProjectGitHubMerge): string {
const number = pending.row.content.number
if (pending.method === 'squash') {
return `Squash and merge PR #${number}?`
}
const action = pending.method === 'rebase' ? 'Rebase and merge' : 'Merge'
return `${action} PR #${number}?`
return mergeConfirmMessage('github', pending.method, pending.row.content.number)
}
export function hostedStateChangeAction(nextState: PendingHostedStateChange['nextState']): string {
@@ -94,6 +94,35 @@ describe('buildUsageFormatValues', () => {
})
})
it('omits duration placeholders and reset fields for nonmatching windows', () => {
const values = buildUsageFormatValues(
provider({
provider: 'kimi',
session: win(14, 60, 3600000),
weekly: win(20, 1440, 3600000),
monthly: win(4, 10080, 3600000)
}),
{ display: 'used', now: NOW, timeZone: 'UTC' }
)
expect(
renderUsageFormatTemplate(
'{provider}[ {5h} {5h.reset} {5h.resetAt}][ {7d} {7d.reset} {7d.resetAt}][ {30d} {30d.reset} {30d.resetAt}]',
values
)
).toBe('Kimi')
expect(values).toMatchObject({
'5h': '',
'5h.reset': '',
'5h.resetAt': '',
'7d': '',
'7d.reset': '',
'7d.resetAt': '',
'30d': '',
'30d.reset': '',
'30d.resetAt': ''
})
})
it('shows remaining percentages when the display setting says so', () => {
const values = buildUsageFormatValues(provider({ session: win(14, 300, null) }), {
display: 'remaining',
@@ -44,12 +44,13 @@ export type UsageFormatValueOptions = {
const WINDOW_KEYS: readonly [
key: string,
minutes: number | null,
pick: (p: ProviderRateLimits) => RateLimitWindow | null | undefined
][] = [
['5h', (p) => p.session],
['7d', (p) => p.weekly],
['fable', (p) => p.fableWeekly],
['30d', (p) => p.monthly]
['5h', 300, (p) => p.session],
['7d', 10080, (p) => p.weekly],
['fable', null, (p) => p.fableWeekly],
['30d', 43200, (p) => p.monthly]
]
// Same subset and order the built-in Gemini rendering shows.
@@ -79,8 +80,9 @@ export function buildUsageFormatValues(
provider: getProviderDisplayName(p.provider),
plan: formatPlanLabel(p.planType) ?? ''
}
for (const [key, pick] of WINDOW_KEYS) {
const window = pick(p)
for (const [key, minutes, pick] of WINDOW_KEYS) {
const candidate = pick(p)
const window = minutes === null || candidate?.windowMinutes === minutes ? candidate : null
values[key] = window ? percent(window, options.display) : ''
values[`${key}.reset`] =
window?.resetsAt != null ? formatResetDuration(window.resetsAt - options.now) : ''
+1 -1
View File
@@ -11734,7 +11734,7 @@
"systemDefault": "システムのデフォルト",
"unavailable": "利用不可",
"label": "マイクロフォン",
"accessHint": "リスト入力デバイスへのマイクのアクセスを許可します。",
"accessHint": "入力デバイスの一覧を表示するには、マイクへのアクセスを許可してください。",
"allowAccess": "アクセスを許可する",
"noMicrophoneFound": "マイクが見つかりませんでした。 1 つ接続してから、再試行してください。",
"openFailedDetail": "マイクを開けませんでした。 {{value0}}",
-1
View File
@@ -1759,7 +1759,6 @@
"permissionOwnDescription": "Terminais e chats seguem as configurações de permissão próprias do agente.",
"permissionOwnShort": "Configurações próprias",
"permissionWithoutAuto": "Agentes sem Aprovar por mim",
"permissionMixed": "Misto",
"permissionSurfaceDifference": "Os terminais usam as configurações próprias do agente; novos chats usam {{mode}}.",
"permissionSameAsAll": "Igual a todos os agentes",
"permissionChipRemove": "Remover {{flag}} e usar as configurações próprias de {{agent}}",