Skip to content
This repository has been archived by the owner on Jul 17, 2024. It is now read-only.

✨ feat(easy Japanese): やさしい日本語ページの文言変更 #196

Merged
merged 10 commits into from
May 4, 2020
Merged

✨ feat(easy Japanese): やさしい日本語ページの文言変更 #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
40582cc
Merge branch 'miyazaki/development' into development
Morichan Apr 28, 2020
bc32985
:bug: fix(ruby): WhiteSpaceの置換設定除去
Morichan Apr 28, 2020
909ccaf
:sparkles: feat(v-data-table): テーブルヘッダーにTI18nコンポーネント適用
Morichan Apr 30, 2020
871eb18
:sparkles: feat(age): 陽性患者の属性テーブルにおける年齢幅上限の追加
Morichan May 1, 2020
9220d32
:bug: fix(v-data-table): 振り仮名表記できなかった居住地カラムの修正
Morichan May 2, 2020
f10b5cc
:sparkles: feat(easy Japanese): やさしい日本語ページの文言変更
Morichan May 2, 2020
cb561ab
:sparkles: feat(english ruby): 英単語におけるルビ振り機能の追加
Morichan May 2, 2020
b47ce27
:cake: chore(yarn.lock): yarn.lockの自動更新
Morichan May 2, 2020
efd9fcd
:sparkles: feat(easy Japanese): 変更漏れの変更
Morichan May 3, 2020
e98fcbf
Merge branch 'development' into ticket-184
korosuke613 May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"日南市": "Nichinan",
"串間市": "Kushima",
"高千穂町": "Takachiho",
"{age}代": " {age}s",
"{ageHead}歳〜{ageTail}歳": " {ageHead}s",
"10歳未満": "Under 10 years old",
"男性": "Male",
"女性": "Female",
Expand Down
460 changes: 218 additions & 242 deletions assets/locales/ja-Hira.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/locales/ja.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"埼玉県": "埼玉県",
"湖南省長沙市": "湖南省長沙市",
"湖北省武漢市": "湖北省武漢市",
"{age}代": "{age}代",
"{ageHead}歳〜{ageTail}歳": "{ageHead}代",
"10歳未満": "10歳未満",
"男性": "男性",
"女性": "女性",
Expand Down
15 changes: 15 additions & 0 deletions components/DataTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@
:mobile-breakpoint="0"
class="cardTable"
>
<template v-slot:header.公表日="{ header }">
<t-i18n>{{ header.text }}</t-i18n>
</template>
<template v-slot:header.居住地="{ header }">
<t-i18n>{{ header.text }}</t-i18n>
</template>
<template v-slot:header.年代="{ header }">
<t-i18n>{{ header.text }}</t-i18n>
</template>
<template v-slot:header.性別="{ header }">
<t-i18n>{{ header.text }}</t-i18n>
</template>
<template v-slot:header.退院="{ header }">
<t-i18n>{{ header.text }}</t-i18n>
</template>
<template v-slot:body="{ items }">
<tbody>
<tr v-for="item in items" :key="item.text">
Expand Down
5 changes: 3 additions & 2 deletions components/cards/ConfirmedCasesAttributesCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ export default {
} else if (row['年代'] === '不明') {
row['年代'] = this.$t('不明')
} else {
const age = row['年代'].substring(0, 2)
row['年代'] = this.$t('{age}代', { age })
const ageHead = row['年代'].substring(0, 2)
const ageTail = String(Number(ageHead) + 9)
row['年代'] = this.$t('{ageHead}歳〜{ageTail}歳', { ageHead, ageTail })
}
}

Expand Down
2 changes: 1 addition & 1 deletion utils/ruby.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const createRubyObject = (text: string) => {
let lastText: string
let pos = 0
const texts: RubyText[] = []
const regp = /([\p{sc=Han}|\s|・]+?)（([\p{sc=Hiragana}|\s|・]+?)）/gu
const regp = /([\p{sc=Han}|・|A-z]+?)（([\p{sc=Hiragana}|\p{sc=Katakana}|ー|・]+?)）/gu

// ふりがなを含んだ文字列をパースしてオブジェクトを生成
while ((match = XRegExp.exec(text, regp, pos))) {
Expand Down
Loading