Skip to content

Commit 41f1f49

Browse files
committed
Merge branch 'main' into lunny/refactor_cat_file
2 parents 97fc21b + e25f860 commit 41f1f49

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

options/locale/locale_pt-PT.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3714,6 +3714,7 @@ creation=Adicionar segredo
37143714
creation.description=Descrição
37153715
creation.name_placeholder=Só sublinhados ou alfanuméricos sem distinguir maiúsculas, sem começar com GITEA_ nem GITHUB_
37163716
creation.value_placeholder=Insira um conteúdo qualquer. Espaços em branco no início ou no fim serão omitidos.
3717+
creation.description_placeholder=Escreva uma descrição curta (opcional).
37173718
creation.success=O segredo "%s" foi adicionado.
37183719
creation.failed=Falhou ao adicionar o segredo.
37193720
deletion=Remover segredo

web_src/js/webcomponents/absolute-date.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ test('toAbsoluteLocaleDate', () => {
2020
// test different timezone
2121
const oldTZ = process.env.TZ;
2222
process.env.TZ = 'America/New_York';
23-
expect(new Date('2024-03-15').toLocaleString()).toEqual('3/14/2024, 8:00:00 PM');
24-
expect(toAbsoluteLocaleDate('2024-03-15')).toEqual('3/15/2024, 12:00:00 AM');
23+
expect(new Date('2024-03-15').toLocaleString('en-US')).toEqual('3/14/2024, 8:00:00 PM');
24+
expect(toAbsoluteLocaleDate('2024-03-15', 'en-US')).toEqual('3/15/2024, 12:00:00 AM');
2525
process.env.TZ = oldTZ;
2626
});

0 commit comments

Comments
 (0)