Re: [Freeciv-Dev] (PR#39720) ottoman nation patch

2007-09-27 Thread Egor Vyscrebentsov

http://bugs.freeciv.org/Ticket/Display.html?id=39720 >

On Wed, 26 Sep 2007 22:52:56 -0700 Daniel Markstedt wrote:

> On 9/27/07, Uğur Çetin  wrote:
> >
> > 27-09-2007 07:18 Daniel Markstedt:
> > > And what about leaving it as it was: "Osman Gazi" and keeping "Bey " as
> > > title.
> >
> > It won't look meaningful because we use "Bey" after a name, not before it. 
> > It
> > will look like writing "Smith Mr." in English if we write "Bey Osman" or 
> > "Bey
> > Osman Gazi".
> 
> This is true for a number of other nations; right now I can think of
> "Khan" in Mongolian et.al. and "Koku-o"/"Jo-o" in Ryukyuan.
> 
> Adding support for appended ruler titles would be a nice nighttime
> project for someone. ;)

So, what do you want? A function which will return string contains
leader name and title in proper order?

-- 
Thanks, evyscr



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39720) ottoman nation patch

2007-09-26 Thread Daniel Markstedt

http://bugs.freeciv.org/Ticket/Display.html?id=39720 >

On 9/27/07, Uğur Çetin <[EMAIL PROTECTED]> wrote:
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39720 >
>
> 27-09-2007 07:18 Daniel Markstedt:
> > > > Good. Only problem here is that "Osman Bey" in a despotist gov will
> > > > appear as "Bey Osman Bey". Does this look ok in Turkish?
> > >
> > > No, It doesn't look okay. Actually "Bey" should be appended to ruler's
> > > name, not prepended.
> > >
> > > So, if it can be configured to append, we should remove "Bey" from "Osman
> > > Bey". If not, "Bey" shouldn't be a title. (btw. "Bey" means "mister" in
> > > Turkish with one little difference that it sholud be appended to a name)
> >
> > (...)
> >
> > And what about leaving it as it was: "Osman Gazi" and keeping "Bey " as
> > title.
>
> It won't look meaningful because we use "Bey" after a name, not before it. It
> will look like writing "Smith Mr." in English if we write "Bey Osman" or "Bey
> Osman Gazi".
>
> --
> Uğur Çetin
>
>
>

This is true for a number of other nations; right now I can think of
"Khan" in Mongolian et.al. and "Koku-o"/"Jo-o" in Ryukyuan.

Adding support for appended ruler titles would be a nice nighttime
project for someone. ;)

 ~Daniel



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39720) ottoman nation patch

2007-09-26 Thread Uğur Çetin

http://bugs.freeciv.org/Ticket/Display.html?id=39720 >

27-09-2007 07:18 Daniel Markstedt:
> > > Good. Only problem here is that "Osman Bey" in a despotist gov will
> > > appear as "Bey Osman Bey". Does this look ok in Turkish?
> >
> > No, It doesn't look okay. Actually "Bey" should be appended to ruler's
> > name, not prepended.
> >
> > So, if it can be configured to append, we should remove "Bey" from "Osman
> > Bey". If not, "Bey" shouldn't be a title. (btw. "Bey" means "mister" in
> > Turkish with one little difference that it sholud be appended to a name)
>
> (...)
>
> And what about leaving it as it was: "Osman Gazi" and keeping "Bey " as
> title.

It won't look meaningful because we use "Bey" after a name, not before it. It 
will look like writing "Smith Mr." in English if we write "Bey Osman" or "Bey 
Osman Gazi".

-- 
Uğur Çetin



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39720) ottoman nation patch

2007-09-26 Thread Daniel Markstedt

http://bugs.freeciv.org/Ticket/Display.html?id=39720 >

On 9/27/07, Uğur Çetin <[EMAIL PROTECTED]> wrote:
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39720 >
>
> 27-09-2007 06:24 Daniel Markstedt:
> > As Daniil is saying, this is to avoid the scenario of having both the
> > Turks and the Ottomans from the beginning of a game. If you want them
> > to civil war to each other, that's ok.
>
> I now agree that it should stand as it was before. Two nations are for
> different eras.
>
> > Good. Only problem here is that "Osman Bey" in a despotist gov will
> > appear as "Bey Osman Bey". Does this look ok in Turkish?
>
> No, It doesn't look okay. Actually "Bey" should be appended to ruler's name,
> not prepended.
>
> So, if it can be configured to append, we should remove "Bey" from "Osman
> Bey". If not, "Bey" shouldn't be a title. (btw. "Bey" means "mister" in
> Turkish with one little difference that it sholud be appended to a name)
>
(...)

And what about leaving it as it was: "Osman Gazi" and keeping "Bey " as title.

 ~Daniel



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39720) ottoman nation patch

2007-09-26 Thread Uğur Çetin

http://bugs.freeciv.org/Ticket/Display.html?id=39720 >

27-09-2007 06:24 Daniel Markstedt:
> As Daniil is saying, this is to avoid the scenario of having both the
> Turks and the Ottomans from the beginning of a game. If you want them
> to civil war to each other, that's ok.

I now agree that it should stand as it was before. Two nations are for 
different eras.

> Good. Only problem here is that "Osman Bey" in a despotist gov will
> appear as "Bey Osman Bey". Does this look ok in Turkish?

No, It doesn't look okay. Actually "Bey" should be appended to ruler's name, 
not prepended.

So, if it can be configured to append, we should remove "Bey" from "Osman 
Bey". If not, "Bey" shouldn't be a title. (btw. "Bey" means "mister" in 
Turkish with one little difference that it sholud be appended to a name)

> Quality work!

Thanks for the review.

-- 
Uğur Çetin



signature.asc
Description: PGP signature
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39720) ottoman nation patch

2007-09-26 Thread Daniel Markstedt

http://bugs.freeciv.org/Ticket/Display.html?id=39720 >

On 9/24/07, Uğur Çetin <[EMAIL PROTECTED]> wrote:
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39720 >
>
> Hi,
>
> This morning I read some Turkish history sites to refresh my elementary school
> memories and come up with this ottoman patch at the end(patch is aganist
> trunk). Changes:
>
> * Removed conflict with Turks (I'm not sure about that. I just didn't see any
> reason for this conflict.)

As Daniil is saying, this is to avoid the scenario of having both the
Turks and the Ottomans from the beginning of a game. If you want them
to civil war to each other, that's ok.

Note that even if two nations 'conflicts' with each other, you can
still select both manually in pregame. It only stops the automatic
selection of both.

> * Updated leader names with their original in Latin letters (also added first
> founder Ertuğrul Gazi)

Good. Only problem here is that "Osman Bey" in a despotist gov will
appear as "Bey Osman Bey". Does this look ok in Turkish?

> * Updated ( or downdate :) ) city names with their original in Ottoman Empire
> and sorted them with historical conquest/foundation order.
> * Fixed a little typo and some tab characters
>
> Review please...
>
> --
> Uğur Çetin
>

Quality work!

Thanks,
 ~Daniel



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39720) ottoman nation patch

2007-09-23 Thread Daniil Ivanov

http://bugs.freeciv.org/Ticket/Display.html?id=39720 >

The reason for that conflict is Turkey was part of Ottoman Empire and
they never coexist. The same as for Russia and Soviet Union.

Thanks, Daniil.

On 23/09/2007, Uğur Çetin <[EMAIL PROTECTED]> wrote:
>
> http://bugs.freeciv.org/Ticket/Display.html?id=39720 >
>
> Hi,
>
> This morning I read some Turkish history sites to refresh my elementary school
> memories and come up with this ottoman patch at the end(patch is aganist
> trunk). Changes:
>
> * Removed conflict with Turks (I'm not sure about that. I just didn't see any
> reason for this conflict.)
> * Updated leader names with their original in Latin letters (also added first
> founder Ertuğrul Gazi)
> * Updated ( or downdate :) ) city names with their original in Ottoman Empire
> and sorted them with historical conquest/foundation order.
> * Fixed a little typo and some tab characters
>
> Review please...
>
> --
> Uğur Çetin
>
>
> ___
> Freeciv-dev mailing list
> Freeciv-dev@gna.org
> https://mail.gna.org/listinfo/freeciv-dev
>
>
>



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#39720) ottoman nation patch

2007-09-23 Thread Uğur Çetin

http://bugs.freeciv.org/Ticket/Display.html?id=39720 >

Hi,

This morning I read some Turkish history sites to refresh my elementary school 
memories and come up with this ottoman patch at the end(patch is aganist 
trunk). Changes:

* Removed conflict with Turks (I'm not sure about that. I just didn't see any 
reason for this conflict.)
* Updated leader names with their original in Latin letters (also added first 
founder Ertuğrul Gazi)
* Updated ( or downdate :) ) city names with their original in Ottoman Empire 
and sorted them with historical conquest/foundation order.
* Fixed a little typo and some tab characters

Review please...

-- 
Uğur Çetin

--- trunk/data/nation/ottoman.ruleset	2007-09-23 21:09:28.0 +0300
+++ freeciv-2.1.0-beta6/data/nation/ottoman.ruleset	2007-09-23 21:08:57.0 +0300
@@ -4,20 +4,21 @@
 plural=_("?plural:Ottomans")
 groups="Medieval", "Asian", "European"
 legend=_("In the beginning of the 14th century Osman, a leader of a\
- minor Turkic tribe in western Anatolia, conquered all his neighboring\
+ minor Turkish tribe in western Anatolia, conquered all his neighboring\
  tribes. A century later the Byzantine capital fell to\
- Turkic rule which gave the Ottoman empire access to Europe. The\
+ Turkish rule which gave the Ottoman empire access to Europe. The\
  Ottomans subsequently conquered large parts of south-eastern\
  Europe, the Islamic Arab world as well as\
  Egypt and much of North Africa, making it a regional superpower\
  until its dissolution in the aftermath of WWI.")
 leader=
- "Fatih sultan Mehmed",
- "Yavuz sultan Selim",
- "Osman Gâzi",
- "Orhan Gâzi",
- "Kânûnî sultan Süleyman"
-leader_sex="Male", "Male", "Male", "Male", "Male"
+ "Fâtih Sultân Mehmed",
+ "Yavuz Sultân Selim",
+ "Ertuğrul Gâzi",
+ "Osman Bey",
+ "Orhan Bey",
+ "Kânûnî Sultân Süleyman"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male"
 flag ="ottoman"
 flag_alt = "turkey"
 city_style = "Classical"
@@ -25,8 +26,8 @@
 ruler_titles = { "government",  "male_title",  "female_title"
  "Despotism",   _("Bey"),  _("Bey")
  "Monarchy",_("Hakan"),_("Hakan")
-		 "Republic",	_("Padisah"),  _("Padisah")
-		 "Democracy",	_("Imparator"),_("Imparator")
+ "Republic",_("Padisah"),  _("Padisah")
+ "Democracy",   _("Imparator"),_("Imparator")
}
 
 init_techs=""
@@ -34,108 +35,96 @@
 init_government="Despotism"
 init_units=""
 
-conflicts_with="turk"
-civilwar_nations="arab", "armenian", "hellenic"
+civilwar_nations="arab", "armenian", "turk"
 
 ; Cities from all over the empire
 cities =
  "Söğüt",
- "Bilecik",
- "Çorum",
- "Içeriçumra",
- "Yekbas",
- "Konya",
- "Maraş",
- "Evren Köyü",
- "Ankara",
- "Mekke",
- "Medine",
- "Kostantiniye",
+ "Bursa",
+ "İznik",
+ "Edremit",
+ "Ezine",
+ "Bergama",
+ "Akhisar",
+ "Kocaeli",
+ "Gelibolu",
  "Edirne",
- "Kirklareli",
- "Adana",
- "Tekirdag",
- "Izmir",
- "Antalya",
- "Sam",
- "Cidde",
- "Mekke",
- "Kahire",
- "Riyad",
- "Sana",
- "Trabzon",
- "Yozgat",
- "Kirikkale",
- "Çorum",
- "Çankiri",
- "Çanakkale",
- "Malatya",
- "Bolu",
- "Çumra",
- "Bartin",
- "Gazipasa",
- "Alanya",
- "Artvin",
- "Kars",
- "Zeytinburnu",
- "Eregli",
- "Gaziantep",
- "Sanliurfa",
- "Diyarbakir",
- "Erzurum",
- "Erzincan",
- "Bayburt",
- "Hakkari",
- "Siirt",
- "Bakü",
- "Alma-ata",
- "Sirnak",
- "Güneysinir",
- "Kâzimkarabekir",
- "Mut",
- "Silifke",
- "Posof",
- "Ardahan",
- "Kasinhani",
- "Sille",
- "Zonguldak",
- "Kastamonu",
- "Kibris",
- "Lefkosa",
- "Gazimagusa",
- "Halep",
- "Bagdat",
- "Cizre",
+ "Niş",
  "Sofya",
- "Selanik",
- "Atina",
- "Saraybosna",
- "Bukareste",
- "Budapeste",
- "Lüleburgaz",
- "Selçuklu",
- "Karatay",
- "Meram",
- "Denizli",
- "Mugla",
- "Pamukkale",
- "Mersin",
- "Tarsus",
- "Seyhan",
- "Ceyhan",
- "Beysehir",
- "Seydisehir",
- "Sinop",
- "Aksehir",
- "Sarkikaraagaç",
- "Egridir",
- "Osmaniye",
- "Bursa",
- "Bingöl",
+ "Manastır",
+ "Larende",
+ "Konya",
+ "Sivas",
  "Kayseri",
- "Elazig",
- "Igdir",
- "Erdemli",
- "Melikgazi",
- "Aktas",
- "Kuzayca"
+ "Niğde",
+ "Adana",
+ "Angara",
+ "Antakya",
+ "Adalya",
+ "Mut",
+ "Hamidâbâd",
+ "Canik",
+ "Trabzon",
+ "Avlonya",
+ "Samsun",
+ "Kütâhiye",
+ "Selânik",
+ "Semendire",
+ "Seged",
+ "Varna",
+ "Kosova",
+ "Konstantiniyye",
+ "Azirum",
+ "Erzingan",
+ "Diyarbekir",
+ "Maraş",
+ "Antep",
+ "Urfa",
+ "İskenderun",
+ "Van",
+ "Mora",
+ "Eğriboz",
+ "Kırım",
+ "Eflak",
+ "Boğdan",
+ "Kili",
+ "Akkirman",
+ "İnebahtı",
+ "Modon",
+ "Navarin",
+ "Koron",
+ "Tebriz",
+ "Şam",
+ "Kâhire",
+ "Cezâyir",
+ "Belgrad",
+ "Rodos",
+ "Bosna",
+ "Bağdat",
+ "Musul",
+ "Budin",
+ "Estergon",
+ "Lahsâ",
+ "Yemen",
+ "Trablusgarb",
+ "Trablusşam",
+ "Fas",
+ "Cerbe",
+ "Astarhan",
+ "Kıbrıs",
+ "Tunus",
+ "Suakin",
+ "Cidde",
+ "Basra",
+ "Budin",
+ "Tameşvar",
+ "Çıldır",
+ "Gürcistan",
+ "Kanije",
+ "Revan",
+ "Girit",
+ "Varad",
+ "Uyvar",
+ "Kandiye",
+ "K