centersl/mikaboshi
1
0
Fork 0
mirror of https://github.com/minagawah/mikaboshi.git synced 2026-03-27 08:28:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

feat: No more "ja2"

Browse Source
This commit is contained in:
minagawah
2022-02-09 18:47:48 +09:00
parent 6489637377
commit bf68287be8
8 changed files with 2 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "mikaboshi"
version = "0.3.0"
version = "0.4.0"
edition = "2018"
[dependencies]

12
json/ganzhi_branches.json
View File

@@ -4,7 +4,6 @@
"name": {
"en": "zi",
"ja": ["ね", "ne"],
"ja2": ["し", "shi"],
"vi": ["tí", "tí"],
"zh_cn": ["子", "zǐ"],
"zh_tw": ["子", "zǐ"]
@@ -15,7 +14,6 @@
"name": {
"en": "chou",
"ja": ["うし", "ushi"],
"ja2": ["ちゅう", "chu"],
"vi": ["sửu", "sửu"],
"zh_cn": ["丑", "chǒu"],
"zh_tw": ["丑", "chǒu"]
@@ -26,7 +24,6 @@
"name": {
"en": "",
"ja": ["とら", "tora"],
"ja2": ["いん", "in"],
"vi": ["dần", "dần"],
"zh_cn": ["寅", "yín"],
"zh_tw": ["寅", "yín"]
@@ -37,7 +34,6 @@
"name": {
"en": "mao",
"ja": ["う", "u"],
"ja2": ["ぼう", "bou"],
"vi": ["mão", "mão"],
"zh_cn": ["卯", "mǎo"],
"zh_tw": ["卯", "mǎo"]
@@ -48,7 +44,6 @@
"name": {
"en": "",
"ja": ["たつ", "tatsu"],
"ja2": ["しん", "shin"],
"vi": ["thần", "thần"],
"zh_cn": ["辰", "chén"],
"zh_tw": ["辰", "chén"]
@@ -59,7 +54,6 @@
"name": {
"en": "si",
"ja": ["み", "mi"],
"ja2": ["し", "shi"],
"vi": ["tị", "tị"],
"zh_cn": ["巳", "sì"],
"zh_tw": ["巳", "sì"]
@@ -70,7 +64,6 @@
"name": {
"en": "wu",
"ja": ["うま", "uma"],
"ja2": ["ご", "go"],
"vi": ["ngọ", "ngọ"],
"zh_cn": ["午", "wǔ"],
"zh_tw": ["午", "wǔ"]
@@ -81,7 +74,6 @@
"name": {
"en": "wei",
"ja": ["ひつじ", "hitsuji"],
"ja2": ["び", "bi"],
"vi": ["vị", "vị"],
"zh_cn": ["未", "wèi"],
"zh_tw": ["未", "wèi"]
@@ -92,7 +84,6 @@
"name": {
"en": "shen",
"ja": ["さる", "saru"],
"ja2": ["しん", "shin"],
"vi": ["thân", "thân"],
"zh_cn": ["申", "shēn"],
"zh_tw": ["申", "shēn"]
@@ -103,7 +94,6 @@
"name": {
"en": "you",
"ja": ["とり", "tori"],
"ja2": ["ゆう", "yuu"],
"vi": ["dậu", "dậu"],
"zh_cn": ["酉", "yǒu"],
"zh_tw": ["酉", "yǒu"]
@@ -114,7 +104,6 @@
"name": {
"en": "xu",
"ja": ["いぬ", "inu"],
"ja2": ["じゅつ", "jutsu"],
"vi": ["tuất", "tuất"],
"zh_cn": ["戌", "xū"],
"zh_tw": ["戌", "xū"]
@@ -125,7 +114,6 @@
"name": {
"en": "hai",
"ja": ["い", "i"],
"ja2": ["がい", "gai"],
"vi": ["hợi", "hợi"],
"zh_cn": ["亥", "hài"],
"zh_tw": ["亥", "hài"]

10
json/ganzhi_stems.json
View File

@@ -4,7 +4,6 @@
"name": {
"en": "jia",
"ja": ["きのえ", "kinoe"],
"ja2": ["コウ", "kou"],
"vi": ["giáp", "giap"],
"zh_cn": ["甲", "jiǎ"],
"zh_tw": ["甲", "jiǎ"]
@@ -15,7 +14,6 @@
"name": {
"en": "yi",
"ja": ["きのと", "kinoto"],
"ja2": ["オツ", "otsu"],
"vi": ["ất", "ất"],
"zh_cn": ["乙", "yǐ"],
"zh_tw": ["乙", "yǐ"]
@@ -26,7 +24,6 @@
"name": {
"en": "bing",
"ja": ["ひのえ", "hinoe"],
"ja2": ["ヘイ", "hei"],
"vi": ["bính", "bính"],
"zh_cn": ["丙", "bǐng"],
"zh_tw": ["丙", "bǐng"]
@@ -37,7 +34,6 @@
"name": {
"en": "ding",
"ja": ["ひのと", "hinoto"],
"ja2": ["テイ", "tei"],
"vi": ["đinh", "đinh"],
"zh_cn": ["丁", "dīng"],
"zh_tw": ["丁", "dīng"]
@@ -48,7 +44,6 @@
"name": {
"en": "wu",
"ja": ["つちのえ", "tsuchinoe"],
"ja2": ["ボ", "bo"],
"vi": ["mậu", "mậu"],
"zh_cn": ["戊", "wù"],
"zh_tw": ["戊", "wù"]
@@ -59,7 +54,6 @@
"name": {
"en": "ji",
"ja": ["つちのと", "tsuchinoe"],
"ja2": ["キ", "ki"],
"vi": ["kỷ", "kỷ"],
"zh_cn": ["己", "jǐ"],
"zh_tw": ["己", "jǐ"]
@@ -70,7 +64,6 @@
"name": {
"en": "geng",
"ja": ["かのえ", "kanoe"],
"ja2": ["コウ", "kou"],
"vi": ["canh", "canh"],
"zh_cn": ["庚", "gēng"],
"zh_tw": ["庚", "gēng"]
@@ -81,7 +74,6 @@
"name": {
"en": "xin",
"ja": ["かのと", "kanoto"],
"ja2": ["シン", "shin"],
"vi": ["tân", "tân"],
"zh_cn": ["辛", "xīn"],
"zh_tw": ["辛", "xīn"]
@@ -92,7 +84,6 @@
"name": {
"en": "ren",
"ja": ["みずのえ", "mizunoe"],
"ja2": ["ジン", "jin"],
"vi": ["nhâm", "nhâm"],
"zh_cn": ["壬", "rén"],
"zh_tw": ["壬", "rén"]
@@ -103,7 +94,6 @@
"name": {
"en": "gui",
"ja": ["みずのと", "mizunoto"],
"ja2": ["キ", "ki"],
"vi": ["quý", "quý"],
"zh_cn": ["癸", "guǐ"],
"zh_tw": ["癸", "guǐ"]

24
json/solar_terms.json
View File

@@ -4,7 +4,6 @@
"name": {
"en": "lichun",
"ja": ["立春", "risshun"],
"ja2": ["りっしゅん", "risshun"],
"vi": ["lập xuân", "lập xuân"],
"zh_cn": ["立春", "lìchūn"],
"zh_tw": ["立春", "lìchūn"]
@@ -16,7 +15,6 @@
"name": {
"en": "yushui",
"ja": ["雨水", "usui"],
"ja2": ["うすい", "usui"],
"vi": ["vũ thủy", "vũ thủy"],
"zh_cn": ["雨水", "yǔshuǐ"],
"zh_tw": ["雨水", "yǔshuǐ"]
@@ -28,7 +26,6 @@
"name": {
"en": "jingzhe",
"ja": ["啓蟄", "keichitsu"],
"ja2": ["けいちつ", "keichitsu"],
"vi": ["kinh trập", "kinh trập"],
"zh_cn": ["驚蟄", "jīngzhé"],
"zh_tw": ["驚蟄", "jīngzhé"]
@@ -40,7 +37,6 @@
"name": {
"en": "chunfen",
"ja": ["春分", "shunbun"],
"ja2": ["しゅんぶん", "shunbun"],
"vi": ["xuân phân", "xuân phân"],
"zh_cn": ["春分", "chūnfēn"],
"zh_tw": ["春分", "chūnfēn"]
@@ -52,7 +48,6 @@
"name": {
"en": "qingming",
"ja": ["清明", "seimei"],
"ja2": ["せいめい", "seimei"],
"vi": ["thanh minh", "thanh minh"],
"zh_cn": ["清明", "qīngmíng"],
"zh_tw": ["清明", "qīngmíng"]
@@ -64,7 +59,6 @@
"name": {
"en": "guyu",
"ja": ["穀雨", "kokuu"],
"ja2": ["こくう", "kokuu"],
"vi": ["cốc vũ", "cốc vũ"],
"zh_cn": ["穀雨", "gǔyǔ"],
"zh_tw": ["穀雨", "gǔyǔ"]
@@ -76,7 +70,6 @@
"name": {
"en": "lixia",
"ja": ["立夏", "rikka"],
"ja2": ["りっか", "rikka"],
"vi": ["lập hạ", "lập hạ"],
"zh_cn": ["立夏", "lìxià"],
"zh_tw": ["立夏", "lìxià"]
@@ -88,7 +81,6 @@
"name": {
"en": "xiaoman",
"ja": ["小満", "shouman"],
"ja2": ["しょうまん", "shouman"],
"vi": ["tiểu mãn", "tiểu mãn"],
"zh_cn": ["小滿", "xiǎomǎn"],
"zh_tw": ["小滿", "xiǎomǎn"]
@@ -100,7 +92,6 @@
"name": {
"en": "mangzhong",
"ja": ["芒種", "boushu"],
"ja2": ["ぼうしゅ", "boushu"],
"vi": ["mang chủng", "mang chủng"],
"zh_cn": ["芒種", "mángzhòng"],
"zh_tw": ["芒種", "mángzhòng"]
@@ -112,7 +103,6 @@
"name": {
"en": "xiazhi",
"ja": ["夏至", "geshi"],
"ja2": ["げし", "geshi"],
"vi": ["hạ chí", "hạ chí"],
"zh_cn": ["夏至", "xiàzhì"],
"zh_tw": ["夏至", "xiàzhì"]
@@ -124,7 +114,6 @@
"name": {
"en": "xiaoshu",
"ja": ["小暑", "shousho"],
"ja2": ["しょうしょ", "shousho"],
"vi": ["tiểu thử", "tiểu thử"],
"zh_cn": ["小暑", "xiǎoshǔ"],
"zh_tw": ["小暑", "xiǎoshǔ"]
@@ -136,7 +125,6 @@
"name": {
"en": "dashu",
"ja": ["大暑", "taisho"],
"ja2": ["たいしょ", "taisho"],
"vi": ["đại thử", "đại thử"],
"zh_cn": ["大暑", "dàshǔ"],
"zh_tw": ["大暑", "dàshǔ"]
@@ -148,7 +136,6 @@
"name": {
"en": "liqiu",
"ja": ["立秋", "risshuu"],
"ja2": ["りっしゅう", "risshuu"],
"vi": ["lập thu", "lập thu"],
"zh_cn": ["立秋", "lìqiū"],
"zh_tw": ["立秋", "lìqiū"]
@@ -160,7 +147,6 @@
"name": {
"en": "chushu",
"ja": ["処暑", "shosho"],
"ja2": ["しょしょ", "shosho"],
"vi": ["xử thử", "xử thử"],
"zh_cn": ["處暑", "chǔshǔ"],
"zh_tw": ["處暑", "chǔshǔ"]
@@ -172,7 +158,6 @@
"name": {
"en": "bailu",
"ja": ["白露", "hakuro"],
"ja2": ["はくろ", "hakuro"],
"vi": ["bạch lộ", "bạch lộ"],
"zh_cn": ["白露", "báilù"],
"zh_tw": ["白露", "báilù"]
@@ -184,7 +169,6 @@
"name": {
"en": "qiufen",
"ja": ["秋分", "shubun"],
"ja2": ["しゅうぶん", "shubun"],
"vi": ["thu phân", "thu phân"],
"zh_cn": ["秋分", "qiūfēn"],
"zh_tw": ["秋分", "qiūfēn"]
@@ -196,7 +180,6 @@
"name": {
"en": "hanlu",
"ja": ["寒露", "kanro"],
"ja2": ["かんろ", "kanro"],
"vi": ["hàn lộ", "hàn lộ"],
"zh_cn": ["寒露", "hánlù"],
"zh_tw": ["寒露", "hánlù"]
@@ -208,7 +191,6 @@
"name": {
"en": "shuanjiang",
"ja": ["霜降", "soukou"],
"ja2": ["そうこう", "soukou"],
"vi": ["sương giáng", "sương giáng"],
"zh_cn": ["霜降", "shuāngjiàng"],
"zh_tw": ["", ""]
@@ -220,7 +202,6 @@
"name": {
"en": "lidong",
"ja": ["立冬", "rittou"],
"ja2": ["りっとう", "rittou"],
"vi": ["lập đông", "lập đông"],
"zh_cn": ["立冬", "lìdōng"],
"zh_tw": ["立冬", "lìdōng"]
@@ -232,7 +213,6 @@
"name": {
"en": "xiaoxue",
"ja": ["小雪", "shousetsu"],
"ja2": ["しょうせつ", "shousetsu"],
"vi": ["tiểu tuyết", "tiểu tuyết"],
"zh_cn": ["小雪", "xiǎoxuě"],
"zh_tw": ["小雪", "xiǎoxuě"]
@@ -244,7 +224,6 @@
"name": {
"en": "daxue",
"ja": ["大雪", "taisetsu"],
"ja2": ["たいせつ", "taisetsu"],
"vi": ["đại tuyết", "đại tuyết"],
"zh_cn": ["大雪", "dàxuě"],
"zh_tw": ["大雪", "dàxuě"]
@@ -256,7 +235,6 @@
"name": {
"en": "dongzhi",
"ja": ["冬至", "touji"],
"ja2": ["とうじ", "touji"],
"vi": ["Đông chí", "Đông chí"],
"zh_cn": ["冬至", "dōngzhì"],
"zh_tw": ["冬至", "dōngzhì"]
@@ -268,7 +246,6 @@
"name": {
"en": "xiaohan",
"ja": ["小寒", "shoukan"],
"ja2": ["しょうかん", "shoukan"],
"vi": ["tiểu hàn", "tiểu hàn"],
"zh_cn": ["小寒", "xiǎohán"],
"zh_tw": ["小寒", "xiǎohán"]
@@ -280,7 +257,6 @@
"name": {
"en": "dahan",
"ja": ["大寒", "daikan"],
"ja2": ["だいかん", "daikan"],
"vi": ["Đại hàn", "Đại hàn"],
"zh_cn": ["大寒", "dàhán"],
"zh_tw": ["大寒", "dàhán"]

4
src/constants.rs
View File

@@ -8,7 +8,6 @@ use crate::solar_terms::SolarTerm;
pub struct LanguageData {
pub en: String,
pub ja: Vec<String>,
pub ja2: Vec<String>,
pub vi: Vec<String>,
pub zh_cn: Vec<String>,
pub zh_tw: Vec<String>,
@@ -47,7 +46,6 @@ lazy_static! {
name: Language {
en: item.name.en,
ja: LanguageDetails::new(&item.name.ja[0], &item.name.ja[1]),
ja2: LanguageDetails::new(&item.name.ja2[0], &item.name.ja2[1]),
vi: LanguageDetails::new(&item.name.vi[0], &item.name.vi[1]),
zh_cn: LanguageDetails::new(&item.name.zh_cn[0], &item.name.zh_cn[1]),
zh_tw: LanguageDetails::new(&item.name.zh_tw[0], &item.name.zh_tw[1]),
@@ -81,7 +79,6 @@ lazy_static! {
name: Language {
en: item.name.en,
ja: LanguageDetails::new(&item.name.ja[0], &item.name.ja[1]),
ja2: LanguageDetails::new(&item.name.ja2[0], &item.name.ja2[1]),
vi: LanguageDetails::new(&item.name.vi[0], &item.name.vi[1]),
zh_cn: LanguageDetails::new(&item.name.zh_cn[0], &item.name.zh_cn[1]),
zh_tw: LanguageDetails::new(&item.name.zh_tw[0], &item.name.zh_tw[1]),
@@ -104,7 +101,6 @@ lazy_static! {
name: Language {
en: item.name.en,
ja: LanguageDetails::new(&item.name.ja[0], &item.name.ja[1]),
ja2: LanguageDetails::new(&item.name.ja2[0], &item.name.ja2[1]),
vi: LanguageDetails::new(&item.name.vi[0], &item.name.vi[1]),
zh_cn: LanguageDetails::new(&item.name.zh_cn[0], &item.name.zh_cn[1]),
zh_tw: LanguageDetails::new(&item.name.zh_tw[0], &item.name.zh_tw[1]),

1
src/language.rs
View File

@@ -10,7 +10,6 @@ pub struct LanguageDetails {
pub struct Language {
pub en: String,
pub ja: LanguageDetails,
pub ja2: LanguageDetails,
pub vi: LanguageDetails,
pub zh_cn: LanguageDetails,
pub zh_tw: LanguageDetails,

46
src/language.rs.backup
View File

@@ -1,46 +0,0 @@
use serde::{ Deserialize, Serialize };
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct LanguageDetails {
pub alphabet: String, // Ex. "甲"
pub phonetic: String, // Ex. "jiǎ"
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct Language {
pub en: String,
pub ja: LanguageDetails,
pub ja2: LanguageDetails,
pub vi: LanguageDetails,
pub zh_cn: LanguageDetails,
pub zh_tw: LanguageDetails,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
impl LanguageDetails {
pub fn new(alphabet: &str, phonetic: &str) -> Self {
LanguageDetails {
alphabet: alphabet.to_string(),
phonetic: phonetic.to_string(),
}
}
}
pub trait LanguageTrait {
fn name(&self) -> Box<Language>;
/// Chinese character in Taiwanese
fn alphabet(&self) -> String {
self.name().zh_tw.alphabet
}
/// Chinese phonetic in Taiwanese
fn phonetic(&self) -> String {
self.name().zh_tw.phonetic
}
/// Japanese character
fn alphabet_ja(&self) -> String {
self.name().ja.alphabet
}
}

2
src/solar_terms.rs
View File

@@ -40,7 +40,7 @@ pub fn get_last_term(date: &Date) -> (f64, Date) {
if lng <= target && lng > (target - 1.0) {
term = prev;
} else {
prev = Some(next.clone());
prev = Some(next);
next = add_date(&next, -1.0);
}
}