From 54238dafda964054c8cd5105c0863a7eef5f6f7d Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 8 Jun 2021 04:18:00 +0300 Subject: [PATCH 55/55] Improve coding style of j*.ruleset nation rulesets See osdn #42490 Signed-off-by: Marko Lindqvist --- data/nation/jaffna.ruleset | 24 +++++----- data/nation/jamaican.ruleset | 17 ++++---- data/nation/japanese.ruleset | 25 ++++++----- data/nation/jolof.ruleset | 82 +++++++++++++++++------------------ data/nation/jordanian.ruleset | 17 ++++---- 5 files changed, 83 insertions(+), 82 deletions(-) diff --git a/data/nation/jaffna.ruleset b/data/nation/jaffna.ruleset index a25daaf7b1..80e23384f6 100644 --- a/data/nation/jaffna.ruleset +++ b/data/nation/jaffna.ruleset @@ -1,15 +1,15 @@ [nation_jaffna] -name=_("Jaffna") -plural=_("?plural:Jaffnas") -groups="Asian", "Early Modern", "Medieval" +name = _("Jaffna") +plural = _("?plural:Jaffnas") +groups = "Asian", "Early Modern", "Medieval" -legend=_("The Jaffna Kingdom was a medieval Tamil kingdom based in the\ +legend = _("The Jaffna Kingdom was a medieval Tamil kingdom based in the\ north of Sri Lanka. It was a successful southern rival to the Chola\ Empire on the Indian mainland.") leaders = { - "name", "sex" + "name", "sex" "Cankili I", "Male" "Singai Pararasasegaram", "Male" "Martanda Cinkaiariyan", "Male" @@ -23,16 +23,16 @@ ruler_titles = { "Monarchy", _("Maharaja %s"), _("Maharani %s") } -flag="jaffna" -flag_alt="-" +flag = "jaffna" +flag_alt = "-" style = "Asian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="Lankese" -civilwar_nations="Chola", "Sinhalese" +conflicts_with = "Lankese" +civilwar_nations = "Chola", "Sinhalese" cities = diff --git a/data/nation/jamaican.ruleset b/data/nation/jamaican.ruleset index c74f996df9..e6dc578f5c 100644 --- a/data/nation/jamaican.ruleset +++ b/data/nation/jamaican.ruleset @@ -1,9 +1,9 @@ [nation_jamaican] -name=_("Jamaican") -plural=_("?plural:Jamaicans") -groups="Modern", "American" -legend=_("Columbus landed on Jamaica in 1494. The island was colonized by\ +name = _("Jamaican") +plural = _("?plural:Jamaicans") +groups = "Modern", "American" +legend = _("Columbus landed on Jamaica in 1494. The island was colonized by\ the Spanish but in 1655 it was conquered by the English, who turned the\ island into a slave-based plantation economy. Slavery was abolished in\ 1834. The country became an independent country within the Commonwealth\ @@ -25,13 +25,14 @@ ruler_titles = { "Fundamentalism", _("Rasta %s"), _("?female:Rasta %s") } -flag="jamaica" +flag = "jamaica" flag_alt = "-" style = "Tropical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + civilwar_nations = "bahamian", "belizean" cities = diff --git a/data/nation/japanese.ruleset b/data/nation/japanese.ruleset index e0646c9f11..f6ed92e176 100644 --- a/data/nation/japanese.ruleset +++ b/data/nation/japanese.ruleset @@ -1,11 +1,11 @@ [nation_japanese] -translation_domain="freeciv" +translation_domain = "freeciv" -name=_("Japanese") -plural=_("?plural:Japanese") -groups="Medieval", "Early Modern", "Modern", "Asian", "Core" -legend=_("According to traditional Japanese mythology, Japan was founded\ +name = _("Japanese") +plural = _("?plural:Japanese") +groups = "Medieval", "Early Modern", "Modern", "Asian", "Core" +legend = _("According to traditional Japanese mythology, Japan was founded\ in the 7th century BCE by the ancestral Emperor Jimmu.") leaders = { @@ -24,14 +24,15 @@ ruler_titles = { "Republic", _("Shogun %s"), _("?female:Shogun %s") } -flag="japan" +flag = "japan" flag_alt = "-" style = "Asian" -init_techs="" -init_buildings="" -init_units="" -civilwar_nations="ryukyuan", "ainu" +init_techs = "" +init_buildings = "" +init_units = "" + +civilwar_nations = "ryukyuan", "ainu" cities = "Tokyo (ocean)", @@ -45,7 +46,7 @@ cities = "Hiroshima (ocean)", "Sendai (ocean)", "Kawasaki (ocean)", - "Kokura (ocean)", ; Modern-day "Kita-Kyushu" + "Kokura (ocean)", ; Modern-day "Kita-Kyushu" "Saitama (!ocean)", "Yokohama (ocean)", "Chiba (ocean)", @@ -101,7 +102,7 @@ cities = "Kawaguchi (!ocean)", "Kushiro (ocean)", "Chofu (!ocean)", - "Fuse (!ocean)", ; One of the old cities that now is "Higashi-Osaka" + "Fuse (!ocean)", ; One of the old cities that now is "Higashi-Osaka" "Kumagaya (!ocean)", "Amagasaki (ocean)", "Ichikawa", diff --git a/data/nation/jolof.ruleset b/data/nation/jolof.ruleset index 72e8fd366a..b4450b6948 100644 --- a/data/nation/jolof.ruleset +++ b/data/nation/jolof.ruleset @@ -1,9 +1,9 @@ [nation_jolof] -name=_("Jolof") -plural=_("?plural:Jolof") -groups="Medieval", "Early Modern", "African" -legend=_("Also called Wolof, the Kingdom was formed between the\ +name = _("Jolof") +plural = _("?plural:Jolof") +groups = "Medieval", "Early Modern", "African" +legend = _("Also called Wolof, the Kingdom was formed between the\ Senegal and Gambia rivers in the 14th century. The King, or Burba\ Jolof, was beholden to a handful of powerful regional noblemen who\ acknowledged kinship with the king but developed personal power\ @@ -14,7 +14,7 @@ legend=_("Also called Wolof, the Kingdom was formed between the\ unions with one another, with their heads assuming the powers of\ Burba Jolof. The 19th century brought with it French colonization\ and a conversion to Islam fueled in large part by anti-European\ - sentiment.") + sentiment.") leaders = { "name", "sex" @@ -25,42 +25,42 @@ leaders = { "Lat-Koddu", "Male" } -flag= "jolof" -flag_alt = "-" -style = "Tropical" +flag = "jolof" +flag_alt = "-" +style = "Tropical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="malian", "senegalese" +civilwar_nations = "malian", "senegalese" -cities = -"Linguère", -"Kaolack", -"Louga", -"Dagana", -"Rosso", -"Dara", -"Kanifing", -"Koki", -"Mekhé", -"Mboro", -"Kébémèr", -"Mpal", -"Lagbar", -"Toubu", -"Gassane", -"Joal-Fadiat", -"Pikine", -"Vélingara", -"Tiel", -"Sokone", -"Mbour", -"Farafenni", -"Bambey", -"Bogué", -"Podor", -"Kerewan", -"Fatick", -"Yoff" +cities = + "Linguère", + "Kaolack", + "Louga", + "Dagana", + "Rosso", + "Dara", + "Kanifing", + "Koki", + "Mekhé", + "Mboro", + "Kébémèr", + "Mpal", + "Lagbar", + "Toubu", + "Gassane", + "Joal-Fadiat", + "Pikine", + "Vélingara", + "Tiel", + "Sokone", + "Mbour", + "Farafenni", + "Bambey", + "Bogué", + "Podor", + "Kerewan", + "Fatick", + "Yoff" diff --git a/data/nation/jordanian.ruleset b/data/nation/jordanian.ruleset index 2b0eb41315..919a0a6404 100644 --- a/data/nation/jordanian.ruleset +++ b/data/nation/jordanian.ruleset @@ -1,9 +1,9 @@ [nation_jordanian] -name=_("Jordanian") -plural=_("?plural:Jordanian") -groups="Asian", "Modern" -legend=_("The Hashemite Kingdom of Jordan is a country in the Middle East.\ +name = _("Jordanian") +plural = _("?plural:Jordanian") +groups = "Asian", "Modern" +legend = _("The Hashemite Kingdom of Jordan is a country in the Middle East.\ During Antiquity the country was the site of numerous ancient\ civilizations, including the Nabateans who built the city of Petra. The\ country has been Arab since the 7th century. Conquered by the Ottoman\ @@ -28,13 +28,13 @@ ruler_titles = { "Fundamentalism", _("Caliph %s"), _("Calipha %s") } -flag="jordan" +flag = "jordan" flag_alt = "-" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" civilwar_nations = "palestinian", "iraqi" @@ -81,4 +81,3 @@ cities = "Dayr Abi Sa'id", "Muhayyam al-Hushin", "Wadi Musa" - -- 2.30.2