From 217cf36fcb535d56caadae985368d46c089bf066 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 4 Jan 2022 03:35:40 +0200 Subject: [PATCH 33/33] Nations: Improve coding style See osdn #43459 Signed-off-by: Marko Lindqvist --- data/nation/barbadian.ruleset | 18 +++++++++--------- data/nation/cham.ruleset | 2 +- data/nation/chickasaw.ruleset | 2 +- data/nation/evenki.ruleset | 3 +-- data/nation/greenlander.ruleset | 2 +- data/nation/liburnian.ruleset | 2 +- data/nation/mughal.ruleset | 2 +- data/nation/ostrogothic.ruleset | 2 +- data/nation/ryukyuan.ruleset | 2 +- data/nation/seminole.ruleset | 2 +- data/nation/southamerican.ruleset | 2 +- data/nation/srivijaya.ruleset | 3 +-- data/nation/taino.ruleset | 3 +-- 13 files changed, 21 insertions(+), 24 deletions(-) diff --git a/data/nation/barbadian.ruleset b/data/nation/barbadian.ruleset index d4a25b4446..a04aaa838f 100644 --- a/data/nation/barbadian.ruleset +++ b/data/nation/barbadian.ruleset @@ -1,9 +1,9 @@ [nation_barbadian] -name=_("Barbadian") -plural=_("?plural:Barbadians") -groups="Modern", "American" -legend=_("Barbados is an island country in the Atlantic Ocean, about 100\ +name = _("Barbadian") +plural = _("?plural:Barbadians") +groups = "Modern", "American" +legend = _("Barbados is an island country in the Atlantic Ocean, about 100\ km east of the Windward Islands in the Caribbean. Originally inhabited by\ Arawaks, the island was discovered by the Portuguese around 1500. When\ the English first settled Barbados in 1627 they found the island\ @@ -27,13 +27,14 @@ ruler_titles = { "Fundamentalism", _("Bishop %s"), _("?female:Bishop %s") } -flag="barbados" +flag = "barbados" flag_alt = "-" style = "Tropical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + civilwar_nations = "trinidadian and tobagonian", "vincentian" cities = @@ -81,4 +82,3 @@ cities = "Seaview", "Lead Vale", "Welchman Hall" - diff --git a/data/nation/cham.ruleset b/data/nation/cham.ruleset index 6549e62e97..10c84303af 100644 --- a/data/nation/cham.ruleset +++ b/data/nation/cham.ruleset @@ -25,7 +25,7 @@ leaders = { } flag = "cham" -flag_alt="-" +flag_alt = "-" style = "Asian" init_techs = "" diff --git a/data/nation/chickasaw.ruleset b/data/nation/chickasaw.ruleset index c3f8558c2b..ca1018b72b 100644 --- a/data/nation/chickasaw.ruleset +++ b/data/nation/chickasaw.ruleset @@ -3,7 +3,7 @@ name = _("Chickasaw") plural = _("?plural:Chickasaws") groups = "Early Modern", "American" -legend=_("One of the so-called Five Civilized Tribes, the Chickasaw\ +legend = _("One of the so-called Five Civilized Tribes, the Chickasaw\ occupied primarily what is today the northern part of the U.S. state of\ Mississippi at the time of first contact with Europeans. The name\ \"Mississippi\" itself originates from a Chickasaw word meaning\ diff --git a/data/nation/evenki.ruleset b/data/nation/evenki.ruleset index 420158816d..cda05cfc24 100644 --- a/data/nation/evenki.ruleset +++ b/data/nation/evenki.ruleset @@ -3,7 +3,6 @@ name = _("Evenki") plural = _("?plural:Evenks") groups = "Asian", "Early Modern" - legend = _("The Evenks are a Tungusic ethnic group in Siberia, Mongolia,\ and northern China. Historical evidence suggests that they have lived\ in the Baikal area on today's Russian-Mongolian border since the Stone\ @@ -23,7 +22,7 @@ ruler_titles = { } flag = "evenkia" -flag_alt="-" +flag_alt = "-" style = "European" init_techs = "" diff --git a/data/nation/greenlander.ruleset b/data/nation/greenlander.ruleset index 5216ce26d9..14ffb6c8b1 100644 --- a/data/nation/greenlander.ruleset +++ b/data/nation/greenlander.ruleset @@ -35,7 +35,7 @@ init_techs = "" init_buildings = "" init_units = "" -civilwar_nations="Inuit", "Danish" +civilwar_nations = "Inuit", "Danish" cities = "Nuuk", ; Godthåb (Danish/Norwegian) diff --git a/data/nation/liburnian.ruleset b/data/nation/liburnian.ruleset index d84cb6de1f..c35c4ed8be 100644 --- a/data/nation/liburnian.ruleset +++ b/data/nation/liburnian.ruleset @@ -21,7 +21,7 @@ leaders = { "Mamaester", "Male" } -flag= "liburnian" +flag = "liburnian" flag_alt = "-" style = "Celtic" diff --git a/data/nation/mughal.ruleset b/data/nation/mughal.ruleset index b8a9a4cfec..ab2b35d21c 100644 --- a/data/nation/mughal.ruleset +++ b/data/nation/mughal.ruleset @@ -23,7 +23,7 @@ ruler_titles = { } flag = "mughal" -flag_alt="-" +flag_alt = "-" style = "Asian" init_techs = "" diff --git a/data/nation/ostrogothic.ruleset b/data/nation/ostrogothic.ruleset index baa1b61267..7a41c6fffe 100644 --- a/data/nation/ostrogothic.ruleset +++ b/data/nation/ostrogothic.ruleset @@ -42,7 +42,7 @@ init_units = "" conflicts_with = "italian", "croatian", "slovenian", "bosnian-herzegovinian", "serbian", "austrian", "illyrian" ; liburnian -civilwar_nations="visigothic", "italian" ; liburnian +civilwar_nations = "visigothic", "italian" ; liburnian cities = "Ravenna", diff --git a/data/nation/ryukyuan.ruleset b/data/nation/ryukyuan.ruleset index acf3f30fdc..1c923f97bc 100644 --- a/data/nation/ryukyuan.ruleset +++ b/data/nation/ryukyuan.ruleset @@ -27,7 +27,7 @@ init_units = "" civilwar_nations = "japanese", "taiwanese" -cities= +cities = ; Okinawan name used, Japanese in comment "Sui", ; Shuri "Naafa", ; Naha diff --git a/data/nation/seminole.ruleset b/data/nation/seminole.ruleset index 73f13e8a96..e2675ffe4c 100644 --- a/data/nation/seminole.ruleset +++ b/data/nation/seminole.ruleset @@ -38,7 +38,7 @@ ruler_titles = { } flag = "seminole" -flag_alt="-" +flag_alt = "-" style = "Celtic" init_techs = "" diff --git a/data/nation/southamerican.ruleset b/data/nation/southamerican.ruleset index 21633472c1..f424e165ce 100644 --- a/data/nation/southamerican.ruleset +++ b/data/nation/southamerican.ruleset @@ -36,7 +36,7 @@ civilwar_nations = "argentine", "bolivian", "brazilian", "chilean", "colombian", "ecuadorian", "guyanese", "paraguayan", "peruvian", "surinamese", "uruguayan", "venezuelan" -cities= +cities = ; Sites of Uasur institutions "Quito", "Cochabamba", diff --git a/data/nation/srivijaya.ruleset b/data/nation/srivijaya.ruleset index 2664f0578f..23df2af9ab 100644 --- a/data/nation/srivijaya.ruleset +++ b/data/nation/srivijaya.ruleset @@ -3,8 +3,7 @@ name = _("Sri Vijaya") plural = _("?plural:Sri Vijaya") groups = "Asian", "Medieval" - -legend=_("Sri Vijaya was an empire centered on Palembang in eastern\ +legend = _("Sri Vijaya was an empire centered on Palembang in eastern\ Sumatra and extended its control through much of the coastal regions of\ Sumatra, Java, Borneo and the Malay peninsula. It was founded sometime in\ the 3rd century CE and lasted until roughly 1400, falling first to Jambi,\ diff --git a/data/nation/taino.ruleset b/data/nation/taino.ruleset index 26eb1a8e1e..c5378b618d 100644 --- a/data/nation/taino.ruleset +++ b/data/nation/taino.ruleset @@ -5,8 +5,7 @@ translation_domain = "freeciv-core" name = _("Taino") plural = _("?plural:Taino") groups = "American", "Core" - -legend=_("Native inhabitants of the Bahamas, Cuba, Hispaniola, Puerto Rico,\ +legend = _("Native inhabitants of the Bahamas, Cuba, Hispaniola, Puerto Rico,\ Jamaica, and other Caribbean islands who gave us the root words for\ hurricane, tobacco, potato, canoe, barbeque, hammock, and yucca. They were\ a matrilineal people, and the first that Columbus came into contact with in\ -- 2.34.1