From efb4236c52e5d1f4a1066dde2b997149e34138a1 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 27 Oct 2021 18:02:04 +0300 Subject: [PATCH 2/2] Improve coding style of z*.ruleset nation rulesets See osdn #43068 Signed-off-by: Marko Lindqvist --- data/nation/zambian.ruleset | 20 ++++++++++---------- data/nation/zanzibari.ruleset | 16 ++++++++-------- data/nation/zapotec.ruleset | 16 ++++++++-------- data/nation/zhuang.ruleset | 20 ++++++++++---------- data/nation/zimbabwean.ruleset | 26 ++++++++++++++------------ data/nation/zulu.ruleset | 25 +++++++++++++------------ 6 files changed, 63 insertions(+), 60 deletions(-) diff --git a/data/nation/zambian.ruleset b/data/nation/zambian.ruleset index 4514ce32fd..2de940d37c 100644 --- a/data/nation/zambian.ruleset +++ b/data/nation/zambian.ruleset @@ -1,24 +1,25 @@ [nation_zambian] -name=_("Zambian") -plural=_("?plural:Zambians") -groups="African", "Modern" -legend=_("Zambia was inhabited by Bantu peoples when it was colonized by\ +name = _("Zambian") +plural = _("?plural:Zambians") +groups = "African", "Modern" +legend = _("Zambia was inhabited by Bantu peoples when it was colonized by\ the British in the 19th century. Governed as Northern Rhodesia by the\ British, Zambia gained its independence in 1964.") + leaders = { "name", "sex" - "Kenneth Kaunda", "male" + "Kenneth Kaunda", "male" "Levy Mwanawasa", "male" } -flag="zambia" +flag = "zambia" flag_alt = "-" style = "tropical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" civilwar_nations = "malawian", "zimbabwean" @@ -66,4 +67,3 @@ cities = "Sinazongwe", "Mwanzakombe", "Chambishi" - diff --git a/data/nation/zanzibari.ruleset b/data/nation/zanzibari.ruleset index 24e25983ad..9b058c295e 100644 --- a/data/nation/zanzibari.ruleset +++ b/data/nation/zanzibari.ruleset @@ -1,9 +1,9 @@ [nation_zanzibari] -name=_("Zanzibari") -plural=_("?plural:Zanzibaris") -groups="African" -legend=_("An archipelago off the coast of Eastern Africa, Zanzibar has\ +name = _("Zanzibari") +plural = _("?plural:Zanzibaris") +groups = "African" +legend = _("An archipelago off the coast of Eastern Africa, Zanzibar has\ been an international trading center since time immemorial. Zanzibari\ traders controlled much of the spice and slave trade in the western part\ of the Indian Ocean. Periods of relative independence and foreign control\ @@ -29,13 +29,13 @@ ruler_titles = { "Fundamentalism", _("Imam %s"), _("Imama %s") } -flag="zanzibar" +flag = "zanzibar" flag_alt = "-" style = "babylonian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" civilwar_nations = "arab", "tanzanian", "omani", "swahili" diff --git a/data/nation/zapotec.ruleset b/data/nation/zapotec.ruleset index dec5298e9f..2ed7ba093d 100644 --- a/data/nation/zapotec.ruleset +++ b/data/nation/zapotec.ruleset @@ -1,9 +1,9 @@ [nation_zapotec] -name=_("Zapotec") -plural=_("?plural:Zapotecs") -groups="Ancient", "Medieval", "American" -legend=_("The Zapotecs or Binnizá live in the Mexican state of Oaxaca.\ +name = _("Zapotec") +plural = _("?plural:Zapotecs") +groups = "Ancient", "Medieval", "American" +legend = _("The Zapotecs or Binnizá live in the Mexican state of Oaxaca.\ They formed one of the oldest and most resilient Mesoamerican\ civilizations. The most notable Zapotec center, Monte Albán, was built\ on a razed mountain top. Benito Juárez, Mexico's first indigenous\ @@ -24,13 +24,13 @@ ruler_titles = { "Despotism", _("Lord %s"), _("Lady %s") } -flag="zapotec" +flag = "zapotec" flag_alt = "mexico" style = "Babylonian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" civilwar_nations = "mixtec", "aztec" diff --git a/data/nation/zhuang.ruleset b/data/nation/zhuang.ruleset index e6ac54a996..9923770284 100644 --- a/data/nation/zhuang.ruleset +++ b/data/nation/zhuang.ruleset @@ -1,9 +1,9 @@ [nation_zhuang] -name=_("Zhuang") -plural=_("?plural:Zhuang") -groups="Asian", "Ancient" -legend=_("The Zhuang people live in far southwestern China, an\ +name = _("Zhuang") +plural = _("?plural:Zhuang") +groups = "Asian", "Ancient" +legend = _("The Zhuang people live in far southwestern China, an\ ancient border region that has long separated Sinitic civilization from\ the aboriginal peoples of Southeast Asia. Known for their unique\ irrigation and scenic terraced rice paddies, they were under pressure from\ @@ -22,15 +22,15 @@ leaders = { "Nong Zhigao", "Male" } -flag="zhuang" -flag_alt="-" +flag = "zhuang" +flag_alt = "-" style = "Asian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="Thai", "Laotian", "Shan" +civilwar_nations = "Thai", "Laotian", "Shan" cities = ; Cities in Guangxi diff --git a/data/nation/zimbabwean.ruleset b/data/nation/zimbabwean.ruleset index 648a3b1d81..af5386d94a 100644 --- a/data/nation/zimbabwean.ruleset +++ b/data/nation/zimbabwean.ruleset @@ -1,9 +1,9 @@ [nation_zimbabwean] -name=_("Zimbabwean") -plural=_("?plural:Zimbabweans") -groups="African", "Modern" -legend=_("Zimbabwe is a country in Southern Africa, named after the old\ +name = _("Zimbabwean") +plural = _("?plural:Zimbabweans") +groups = "African", "Modern" +legend = _("Zimbabwe is a country in Southern Africa, named after the old\ Zimbabwe kingdom. It became a British colony called South Rhodesia\ in 1898. The white minority in South Rhodesia unilaterally declared\ independence in 1965. Prime Minister Ian Smith installed a racist regime\ @@ -21,21 +21,23 @@ leaders = { "Chenjerai Hunzvi", "Male" "Robert Mugabe", "Male" } + ruler_titles = { "government", "male_title", "female_title" "Fundamentalism", _("Bishop %s"), _("?female:Bishop %s") } -flag="zimbabwe" -flag_alt = "-" -style = "tropical" -init_techs="" -init_buildings="" -init_units="" +flag = "zimbabwe" +flag_alt = "-" +style = "tropical" + +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="South African", "Boer", "Venda" +civilwar_nations = "South African", "Boer", "Venda" -cities = +cities = "Harare", "Bulawayo", "Mutare", diff --git a/data/nation/zulu.ruleset b/data/nation/zulu.ruleset index 2908e363f8..608c0e08cc 100644 --- a/data/nation/zulu.ruleset +++ b/data/nation/zulu.ruleset @@ -1,11 +1,11 @@ [nation_zulu] -translation_domain="freeciv" +translation_domain = "freeciv" -name=_("Zulu") -plural=_("?plural:Zulus") -groups="African", "Early Modern", "Core" -legend=_("The Zulus are a warlike Bantu people who migrated from\ +name = _("Zulu") +plural = _("?plural:Zulus") +groups = "African", "Early Modern", "Core" +legend = _("The Zulus are a warlike Bantu people who migrated from\ west-central Africa into southern Africa beginning in the early 1700s,\ conquering the native Khoisan peoples and clashing with European settlers.") @@ -42,20 +42,21 @@ ruler_titles = { "Democracy", _("Principal Chief %s"), _("?female:Principal Chief %s") } -flag="zulu" +flag = "zulu" flag_alt = "rwanda" ; used previously style = "Tropical" -init_techs="" -init_buildings="" -init_units="" -civilwar_nations="xhosa", "swazi" +init_techs = "" +init_buildings = "" +init_units = "" + +civilwar_nations = "xhosa", "swazi" cities = "Zimbabwe", "Ulundi", - "Ethekwini", ; Boer name: Durban - "Tshwane", ; Boer name: Pretoria + "Ethekwini", ; Boer name: Durban + "Tshwane", ; Boer name: Pretoria "Harare", "Maputo", "Bulaweyo", -- 2.30.2