Skip to content

Commit 0c6031e

Browse files
committed
:docs: Improve AOJ JAG contest labels (#1526)
1 parent 88b1a9a commit 0c6031e

File tree

3 files changed

+38
-36
lines changed

3 files changed

+38
-36
lines changed

src/lib/utils/contest.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,8 @@ export function getAtCoderUniversityContestLabel(contestId: string): string {
356356
);
357357
}
358358

359+
const SPACE = ' ';
360+
359361
/**
360362
* Maps PCK contest type abbreviations to their Japanese translations.
361363
*
@@ -368,8 +370,8 @@ export function getAtCoderUniversityContestLabel(contestId: string): string {
368370
*/
369371
const PCK_TRANSLATIONS = {
370372
PCK: 'パソコン甲子園',
371-
Prelim: '予選',
372-
Final: '本選',
373+
Prelim: SPACE + '予選' + SPACE,
374+
Final: SPACE + '本選' + SPACE,
373375
};
374376

375377
/**
@@ -382,8 +384,8 @@ const PCK_TRANSLATIONS = {
382384
* }
383385
*/
384386
const JAG_TRANSLATIONS = {
385-
Prelim: '模擬国内',
386-
Regional: '模擬地区',
387+
Prelim: SPACE + '模擬国内' + SPACE,
388+
Regional: SPACE + '模擬地区' + SPACE,
387389
};
388390

389391
const aojBaseLabel = 'AOJ - ';
@@ -398,7 +400,7 @@ function getAojChallengeLabel(
398400
label = label.replace(abbrEnglish, japanese);
399401
});
400402

401-
return aojBaseLabel + label;
403+
return aojBaseLabel + '(' + label + ')';
402404
}
403405

404406
export const addContestNameToTaskIndex = (contestId: string, taskTableIndex: string): string => {

src/test/lib/utils/test_cases/contest_name_and_task_index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ const generateAojPckTestCases = (
432432
)({
433433
contestId: `PCK${contestId}`,
434434
taskTableIndex: taskIndex,
435-
expected: `AOJ - パソコン甲子園${contestId.replace('Prelim', '予選').replace('Final', '本選')} - ${taskIndex}`,
435+
expected: `AOJ - パソコン甲子園${contestId.replace('Prelim', ' 予選 ').replace('Final', ' 本選 ')} - ${taskIndex}`,
436436
});
437437

438438
return testCase;
@@ -534,7 +534,7 @@ const generateAojJagTestCases = (contestIds: JagContestIds, taskIndices: string[
534534
taskIndices,
535535
(contestId, taskIndex) => `AOJ, JAG${contestId} - ${taskIndex}`,
536536
(contestId, taskIndex) =>
537-
`AOJ - JAG${contestId.replace('Prelim', '模擬国内').replace('Regional', '模擬地区')} - ${taskIndex}`,
537+
`AOJ - JAG${contestId.replace('Prelim', ' 模擬国内 ').replace('Regional', ' 模擬地区 ')} - ${taskIndex}`,
538538
);
539539

540540
export const aojJag = Object.entries(AOJ_JAG_TEST_DATA).flatMap(([contestId, tasks]) =>

src/test/lib/utils/test_cases/contest_name_labels.ts

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -334,121 +334,121 @@ export const aojCourses = [
334334
export const aojPck = [
335335
createTestCaseForContestNameLabel('AOJ, PCK Prelim 2023')({
336336
contestId: 'PCKPrelim2023',
337-
expected: 'AOJ - パソコン甲子園予選2023',
337+
expected: 'AOJ - (パソコン甲子園 予選 2023)',
338338
}),
339339
createTestCaseForContestNameLabel('AOJ, PCK Prelim 2022')({
340340
contestId: 'PCKPrelim2022',
341-
expected: 'AOJ - パソコン甲子園予選2022',
341+
expected: 'AOJ - (パソコン甲子園 予選 2022)',
342342
}),
343343
createTestCaseForContestNameLabel('AOJ, PCK Prelim 2005')({
344344
contestId: 'PCKPrelim2005',
345-
expected: 'AOJ - パソコン甲子園予選2005',
345+
expected: 'AOJ - (パソコン甲子園 予選 2005)',
346346
}),
347347
createTestCaseForContestNameLabel('AOJ, PCK Prelim 2004')({
348348
contestId: 'PCKPrelim2004',
349-
expected: 'AOJ - パソコン甲子園予選2004',
349+
expected: 'AOJ - (パソコン甲子園 予選 2004)',
350350
}),
351351
createTestCaseForContestNameLabel('AOJ, PCK Final 2023')({
352352
contestId: 'PCKFinal2023',
353-
expected: 'AOJ - パソコン甲子園本選2023',
353+
expected: 'AOJ - (パソコン甲子園 本選 2023)',
354354
}),
355355
createTestCaseForContestNameLabel('AOJ, PCK Final 2022')({
356356
contestId: 'PCKFinal2022',
357-
expected: 'AOJ - パソコン甲子園本選2022',
357+
expected: 'AOJ - (パソコン甲子園 本選 2022)',
358358
}),
359359
createTestCaseForContestNameLabel('AOJ, PCK Final 2021')({
360360
contestId: 'PCKFinal2021',
361-
expected: 'AOJ - パソコン甲子園本選2021',
361+
expected: 'AOJ - (パソコン甲子園 本選 2021)',
362362
}),
363363
createTestCaseForContestNameLabel('AOJ, PCK Final 2004')({
364364
contestId: 'PCKFinal2004',
365-
expected: 'AOJ - パソコン甲子園本選2004',
365+
expected: 'AOJ - (パソコン甲子園 本選 2004)',
366366
}),
367367
createTestCaseForContestNameLabel('AOJ, PCK Final 2003')({
368368
contestId: 'PCKFinal2003',
369-
expected: 'AOJ - パソコン甲子園本選2003',
369+
expected: 'AOJ - (パソコン甲子園 本選 2003)',
370370
}),
371371
];
372372

373373
export const aojJag = [
374374
createTestCaseForContestNameLabel('AOJ, JAG Prelim 2005')({
375375
contestId: 'JAGPrelim2005',
376-
expected: 'AOJ - JAG模擬国内2005',
376+
expected: 'AOJ - (JAG 模擬国内 2005)',
377377
}),
378378
createTestCaseForContestNameLabel('AOJ, JAG Prelim 2006')({
379379
contestId: 'JAGPrelim2006',
380-
expected: 'AOJ - JAG模擬国内2006',
380+
expected: 'AOJ - (JAG 模擬国内 2006)',
381381
}),
382382
createTestCaseForContestNameLabel('AOJ, JAG Prelim 2009')({
383383
contestId: 'JAGPrelim2009',
384-
expected: 'AOJ - JAG模擬国内2009',
384+
expected: 'AOJ - (JAG 模擬国内 2009)',
385385
}),
386386
createTestCaseForContestNameLabel('AOJ, JAG Prelim 2010')({
387387
contestId: 'JAGPrelim2010',
388-
expected: 'AOJ - JAG模擬国内2010',
388+
expected: 'AOJ - (JAG 模擬国内 2010)',
389389
}),
390390
createTestCaseForContestNameLabel('AOJ, JAG Prelim 2011')({
391391
contestId: 'JAGPrelim2011',
392-
expected: 'AOJ - JAG模擬国内2011',
392+
expected: 'AOJ - (JAG 模擬国内 2011)',
393393
}),
394394
createTestCaseForContestNameLabel('AOJ, JAG Prelim 2020')({
395395
contestId: 'JAGPrelim2020',
396-
expected: 'AOJ - JAG模擬国内2020',
396+
expected: 'AOJ - (JAG 模擬国内 2020)',
397397
}),
398398
createTestCaseForContestNameLabel('AOJ, JAG Prelim 2021')({
399399
contestId: 'JAGPrelim2021',
400-
expected: 'AOJ - JAG模擬国内2021',
400+
expected: 'AOJ - (JAG 模擬国内 2021)',
401401
}),
402402
createTestCaseForContestNameLabel('AOJ, JAG Prelim 2022')({
403403
contestId: 'JAGPrelim2022',
404-
expected: 'AOJ - JAG模擬国内2022',
404+
expected: 'AOJ - (JAG 模擬国内 2022)',
405405
}),
406406
createTestCaseForContestNameLabel('AOJ, JAG Prelim 2023')({
407407
contestId: 'JAGPrelim2023',
408-
expected: 'AOJ - JAG模擬国内2023',
408+
expected: 'AOJ - (JAG 模擬国内 2023)',
409409
}),
410410
createTestCaseForContestNameLabel('AOJ, JAG Prelim 2024')({
411411
contestId: 'JAGPrelim2024',
412-
expected: 'AOJ - JAG模擬国内2024',
412+
expected: 'AOJ - (JAG 模擬国内 2024)',
413413
}),
414414
createTestCaseForContestNameLabel('AOJ, JAG Regional 2005')({
415415
contestId: 'JAGRegional2005',
416-
expected: 'AOJ - JAG模擬地区2005',
416+
expected: 'AOJ - (JAG 模擬地区 2005)',
417417
}),
418418
createTestCaseForContestNameLabel('AOJ, JAG Regional 2006')({
419419
contestId: 'JAGRegional2006',
420-
expected: 'AOJ - JAG模擬地区2006',
420+
expected: 'AOJ - (JAG 模擬地区 2006)',
421421
}),
422422
createTestCaseForContestNameLabel('AOJ, JAG Regional 2009')({
423423
contestId: 'JAGRegional2009',
424-
expected: 'AOJ - JAG模擬地区2009',
424+
expected: 'AOJ - (JAG 模擬地区 2009)',
425425
}),
426426
createTestCaseForContestNameLabel('AOJ, JAG Regional 2010')({
427427
contestId: 'JAGRegional2010',
428-
expected: 'AOJ - JAG模擬地区2010',
428+
expected: 'AOJ - (JAG 模擬地区 2010)',
429429
}),
430430
createTestCaseForContestNameLabel('AOJ, JAG Regional 2011')({
431431
contestId: 'JAGRegional2011',
432-
expected: 'AOJ - JAG模擬地区2011',
432+
expected: 'AOJ - (JAG 模擬地区 2011)',
433433
}),
434434
createTestCaseForContestNameLabel('AOJ, JAG Regional 2016')({
435435
contestId: 'JAGRegional2016',
436-
expected: 'AOJ - JAG模擬地区2016',
436+
expected: 'AOJ - (JAG 模擬地区 2016)',
437437
}),
438438
createTestCaseForContestNameLabel('AOJ, JAG Regional 2017')({
439439
contestId: 'JAGRegional2017',
440-
expected: 'AOJ - JAG模擬地区2017',
440+
expected: 'AOJ - (JAG 模擬地区 2017)',
441441
}),
442442
createTestCaseForContestNameLabel('AOJ, JAG Regional 2020')({
443443
contestId: 'JAGRegional2020',
444-
expected: 'AOJ - JAG模擬地区2020',
444+
expected: 'AOJ - (JAG 模擬地区 2020)',
445445
}),
446446
createTestCaseForContestNameLabel('AOJ, JAG Regional 2021')({
447447
contestId: 'JAGRegional2021',
448-
expected: 'AOJ - JAG模擬地区2021',
448+
expected: 'AOJ - (JAG 模擬地区 2021)',
449449
}),
450450
createTestCaseForContestNameLabel('AOJ, JAG Regional 2022')({
451451
contestId: 'JAGRegional2022',
452-
expected: 'AOJ - JAG模擬地区2022',
452+
expected: 'AOJ - (JAG 模擬地区 2022)',
453453
}),
454454
];

0 commit comments

Comments
 (0)