[Freeciv-Dev] (PR#39732) README for 2.1 release
http://bugs.freeciv.org/Ticket/Display.html?id=39732 > doc/README is outdated for 2.1 release. Patch attached. BTW, localized READMEs are probably even more outdated. Haven't looked into this yet. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39725) Various typos in client, remove log translation
http://bugs.freeciv.org/Ticket/Display.html?id=39725 > > [wsimpson - Jeu. Sep. 27 18:34:13 2007]: > > Marko Lindqvist wrote: > > Messages meant for end-user should be translated. > > > Error messages meant for users are sent as message packets. > What is the link between message packets and freelog()? I don't understand. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39725) Various typos in client, remove log translation
http://bugs.freeciv.org/Ticket/Display.html?id=39725 >
Marko Lindqvist wrote:
> Messages meant for end-user should be translated.
>
Error messages meant for users are sent as message packets.
LOG_ERROR is *never* meant for users, it is for developers.
See HACKING:
Messages and text in general which are shown in the GUI should be
translated by using the "_()" macro. In addition freelog(LOG_NORMAL,
...) messages should be translated. The other loglevels (LOG_FATAL,
LOG_ERROR, LOG_VERBOSE, LOG_DEBUG) should NOT be translated.
See also
http://freeciv.wikia.com/wiki/Internationalization
> If user tries to load unavailable soundset, error message should be
> translated
>
> - freelog(LOG_ERROR, _("Couldn't find soundset \"%s\" trying \"%s\"."),
> + freelog(LOG_ERROR, "Couldn't find soundset \"%s\", trying \"%s\".",
> soundset_name, soundset_default);
>
If a user tries to load an unavailable soundset, it is a bug in the
selections dialog, and a developer problem!
> Not sure if this also is response to user action (plugin selection):
>
> -freelog(LOG_ERROR, _("Plugin %s found but can't be initialized."), name);
> +freelog(LOG_ERROR, "Plugin %s found, but can't be initialized.", name);
>
Again, a developer problem. No user remediation is possible.
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39726) Typo in helpdata.txt
http://bugs.freeciv.org/Ticket/Display.html?id=39726 >
Upon inspection, there were quite a few errors in that section.
Committed trunk revision 13667.
Committed S2_2 revision 13668.
Index: data/helpdata.txt
===
--- data/helpdata.txt (revision 13666)
+++ data/helpdata.txt (working copy)
@@ -780,15 +780,15 @@
Cease-fire, Armistice, Peace, and Alliance. The first is the default state, \
while the others can be achieved by signing diplomatic treaties.\
"), _("\
- To have a diplomatic relationship with another player, you must fist \
-establish first contact with that player. To establish first contact, you \
-have to move one of your units next to a city or unit belonging to that \
+ To have a diplomatic relationship with another player, you must \
+establish contact with that player. Contact occurs whenever \
+one of your units is within sight of a city or unit belonging to another \
player, or vice versa. Unless you establish an embassy with that player, \
-you may again lose contact with them after a set number of turns without \
-direct physical contact.\
+you may again lose contact with them a set number of turns after \
+most recent contact.\
"), _("\
The diplomatic state between players defaults to War. \
-During War, you can freely move you units inside enemy territory and \
+During War, you can freely move your units inside enemy territory and \
attack their units and cities at will.\
"), _("\
When two players decide to end hostilities between them, they can \
@@ -803,7 +803,7 @@
"), _("\
At the moment two players enter into the diplomatic state of Peace, \
all units belonging to either player that happen to be within the other's \
-borders, will be automatically disbanded according to the treaty. After \
+borders will be automatically disbanded according to the treaty. After \
this, you may not move units into the other's territory until you either \
declare War, or forge an Alliance. Breaking a Peace treaty will drop you \
directly back to War.\
@@ -812,8 +812,8 @@
players. In this state, you may move units into each other's cities and \
your units may share the same square. An allied AI player will freely give \
you its world maps, shared vision, as well as seriously consider trading \
-technologies and cities. The only drawback with an alliance, is that it \
-will draw you into to any wars your ally enters against other players. \
+technologies and cities. The only drawback with an alliance is that it \
+will draw you into any wars your ally enters against other players. \
Breaking an Alliance will drop you to an Armistice treaty.\
")
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39725) Various typos in client, remove log translation
http://bugs.freeciv.org/Ticket/Display.html?id=39725 >
On 27/09/2007, William Allen Simpson wrote:
>
> Upon inspection, more errors found. Only LOG_NORMAL should be translated.
Messages meant for end-user should be translated.
If user tries to load unavailable soundset, error message should be translated
- freelog(LOG_ERROR, _("Couldn't find soundset \"%s\" trying \"%s\"."),
+ freelog(LOG_ERROR, "Couldn't find soundset \"%s\", trying \"%s\".",
soundset_name, soundset_default);
...
+freelog(LOG_ERROR, "Cannot find sound spec-file \"%s\".", spec_name);
Not sure if this also is response to user action (plugin selection):
-freelog(LOG_ERROR, _("Plugin %s found but can't be initialized."), name);
+freelog(LOG_ERROR, "Plugin %s found, but can't be initialized.", name);
- ML
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39725) Various typos in client, remove log translation
http://bugs.freeciv.org/Ticket/Display.html?id=39725 >
Upon inspection, more errors found. Only LOG_NORMAL should be translated.
Committed trunk revision 13665.
Committed S2_2 revision 13666.
Index: client/gui-sdl/gui_string.c
===
--- client/gui-sdl/gui_string.c (revision 13664)
+++ client/gui-sdl/gui_string.c (working copy)
@@ -170,7 +170,7 @@
}
if ((str->font = load_font(str->ptsize)) == NULL) {
-freelog(LOG_ERROR, _("Error in create_string16: Aborting ..."));
+freelog(LOG_ERROR, "create_string16: load_font failed");
FC_FREE(str);
return str;
}
@@ -222,7 +222,7 @@
SDL_Surface *pText = create_text_surf_from_str16(pString);
if (alphablit(pText, NULL, pDest, &dst_rect) < 0) {
-freelog(LOG_ERROR, _("Couldn't blit text to display: %s"),
+freelog(LOG_ERROR, "write_text16: couldn't blit text to display: %s",
SDL_GetError());
FREESURFACE(pText);
return -1;
@@ -260,8 +260,8 @@
if ((pText = SDL_DisplayFormat(pTmp)) == NULL) {
freelog(LOG_ERROR,
- _("Error in SDL_create_str16_surf: Couldn't convert text "
- "to display format: %s"), SDL_GetError());
+ "SDL_create_str16_surf: couldn't convert text "
+ "to display format: %s", SDL_GetError());
pText = pTmp;
} else {
FREESURFACE( pTmp );
@@ -277,9 +277,9 @@
if (pText != NULL) {
freelog(LOG_DEBUG,
-_("SDL_create_str16_surf: Font is generally %d big, and "
- "string is %hd big"), TTF_FontHeight(pString->font), pText->h);
-freelog(LOG_DEBUG, _("SDL_create_str16_surf: String is %d lenght"),
+"SDL_create_str16_surf: Font is generally %d big, and "
+ "string is %hd big", TTF_FontHeight(pString->font), pText->h);
+freelog(LOG_DEBUG, "SDL_create_str16_surf: String is %d length",
pText->w);
} else {
freelog(LOG_DEBUG, "SDL_create_str16_surf: pText NULL");
@@ -569,7 +569,7 @@
}
if ((pBuf = load_font(new_ptsize)) == NULL) {
-freelog(LOG_ERROR, _("Error in change_ptsize: Change ptsize failed"));
+freelog(LOG_ERROR, "change_ptsize: load_font failed");
return;
}
@@ -617,7 +617,7 @@
/* Load Font */
if ((font_tmp = TTF_OpenFont(pFont_with_FullPath, ptsize)) == NULL) {
freelog(LOG_ERROR,
- _("Error in load_font: Couldn't load %d pt font from %s: %s"),
+ "load_font: Couldn't load %d pt font from %s: %s",
ptsize, pFont_with_FullPath, SDL_GetError());
return font_tmp;
}
@@ -658,7 +658,7 @@
if (Sizeof_Font_TAB == 0) {
freelog(LOG_ERROR,
-_("Error in unload_font: Trying unload from empty Font ARRAY"));
+ "unload_font: Trying unload from empty Font ARRAY");
return;
}
@@ -672,8 +672,8 @@
if (index == Sizeof_Font_TAB) {
freelog(LOG_ERROR,
- _("Error in unload_font: Trying unload Font which is "
- "not included in Font ARRAY"));
+ "unload_font: Trying unload Font which is "
+ "not included in Font ARRAY");
return;
}
Index: client/audio.c
===
--- client/audio.c (revision 13664)
+++ client/audio.c (working copy)
@@ -122,12 +122,12 @@
}
if (!plugins[i].init()) {
-freelog(LOG_ERROR, _("Plugin %s found but can't be initialized."), name);
+freelog(LOG_ERROR, "Plugin %s found, but can't be initialized.", name);
return FALSE;
}
selected_plugin = i;
- freelog(LOG_VERBOSE, _("Plugin '%s' is now selected"),
+ freelog(LOG_VERBOSE, "Plugin '%s' is now selected",
plugins[selected_plugin].name);
return TRUE;
}
@@ -171,7 +171,7 @@
return NULL;
}
- freelog(LOG_ERROR, _("Couldn't find soundset \"%s\" trying \"%s\"."),
+ freelog(LOG_ERROR, "Couldn't find soundset \"%s\", trying \"%s\".",
soundset_name, soundset_default);
return soundspec_fullname(soundset_default);
}
@@ -188,33 +188,31 @@
if (strcmp(prefered_plugin_name, "none") == 0) {
/* We explicitly choose none plugin, silently skip the code below */
-freelog(LOG_VERBOSE, _("Proceeding with sound support disabled"));
+freelog(LOG_VERBOSE, "Proceeding with sound support disabled.");
tagfile = NULL;
return;
}
if (num_plugins_used == 1) {
/* We only have the dummy plugin, skip the code but issue an advertise */
-freelog(LOG_NORMAL, _("No real audio plugin present, "
- "proceeding with sound support disabled"));
-freelog(LOG_NORMAL,
- _("For sound support, install SDL_mixer"));
-freelog(LOG_NORMAL, _("http://www.libsdl.org/";
- "projects/SDL_mixer/index.html"));
+freelog(LOG_NORMAL, _("No real audio plugin present."));
+freelog(LOG_NORMAL, _("Proceeding with sound support disabled."));
+freelog(LOG_NORMAL, _("For sound support, install SDL_mixer"));
+freelog(L
[Freeciv-Dev] (PR#39723) Re: (PR#39724) Typos in server/settings.c
http://bugs.freeciv.org/Ticket/Display.html?id=39723 >
Upon inspection, noticed other grammatical errors, too.
Committed trunk revision 13663.
Committed S2_2 revision 13664.
Index: settings.c
===
--- settings.c (revision 13662)
+++ settings.c (working copy)
@@ -176,7 +176,7 @@
}
#endif
if (value < player_count()) {
-*error_string =_("Number of players is higher than requested value; "
+*error_string =_("Number of players is higher than requested value;\n"
"Keeping old value.");
return FALSE;
}
@@ -403,8 +403,8 @@
N_("Amount of huts (minor tribe villages)"),
N_("This setting gives the exact number of huts that will be "
"placed on the entire map. Huts are small tribal villages "
-"that may be investiged by units."), NULL,
- MAP_MIN_HUTS, MAP_MAX_HUTS, MAP_DEFAULT_HUTS)
+"that may be investigated by units."),
+ NULL, MAP_MIN_HUTS, MAP_MAX_HUTS, MAP_DEFAULT_HUTS)
/* Options affecting numbers of players and AI players. These only
* affect the start of the game and can not be adjusted after that.
@@ -499,7 +499,7 @@
N_("Percentage penalty when changing tech"),
N_("If you change your current research technology, and you have "
"positive research points, you lose this percentage of those "
-"research points. This does not apply if you have just gained "
+"research points. This does not apply when you have just gained "
"a technology this turn."), NULL,
GAME_MIN_TECHPENALTY, GAME_MAX_TECHPENALTY,
GAME_DEFAULT_TECHPENALTY)
@@ -508,19 +508,21 @@
SSET_RULES, SSET_SCIENCE, SSET_RARE, SSET_TO_CLIENT,
N_("Penalty when getting tech or gold from treaty"),
N_("For each technology you gain from a diplomatic treaty, you "
-"lost research points equal to this percentage of the cost to "
-"research a new technology. You can end up with negative "
-"research points if this is non-zero. Also applies to gold "
- "transfers in diplomatic treaties."), NULL,
+"lose research points equal to this percentage of the cost to "
+"research a new technology. If this is non-zero, you can end up "
+"with negative research points. Also applies to gold "
+ "transfers in diplomatic treaties."),
+ NULL,
GAME_MIN_DIPLCOST, GAME_MAX_DIPLCOST, GAME_DEFAULT_DIPLCOST)
GEN_INT("conquercost", game.info.conquercost,
SSET_RULES, SSET_SCIENCE, SSET_RARE, SSET_TO_CLIENT,
N_("Penalty when getting tech from conquering"),
N_("For each technology you gain by conquering an enemy city, you "
-"lose research points equal to this percentage of the cost "
-"to research a new technology. You can end up with negative "
-"research points if this is non-zero."), NULL,
+"lose research points equal to this percentage of the cost to "
+"research a new technology. If this is non-zero, you can end up "
+"with negative research points."),
+ NULL,
GAME_MIN_CONQUERCOST, GAME_MAX_CONQUERCOST,
GAME_DEFAULT_CONQUERCOST)
@@ -531,8 +533,8 @@
"covered by diplcost or conquercost: specifically, from huts "
"or from Great Library effects), you lose research points "
"equal to this percentage of the cost to research a new "
-"technology. You can end up with negative research points if "
-"this is non-zero."),
+"technology. If this is non-zero, you can end up "
+"with negative research points."),
NULL,
GAME_MIN_FREECOST, GAME_MAX_FREECOST, GAME_DEFAULT_FREECOST)
@@ -547,10 +549,10 @@
GEN_INT("aqueductloss", game.info.aqueductloss,
SSET_RULES, SSET_ECONOMICS, SSET_RARE, SSET_TO_CLIENT,
- N_("Percentage food lost when need aqueduct"),
+ N_("Percentage food lost when building needed"),
N_("If a city would expand, but it can't because it needs "
"an Aqueduct (or Sewer System), it loses this percentage "
-"of its foodbox (or half that amount if it has a "
+"of its foodbox (or half that amount when it has a "
"Granary)."), NULL,
GAME_MIN_AQUEDUCTLOSS, GAME_MAX_AQUEDUCTLOSS,
GAME_DEFAULT_AQUEDUCTLOSS)
@@ -594,9 +596,9 @@
GEN_INT("citymindist", game.info.citymindist,
SSET_RULES, SSET_SOCIOLOGY, SSET_SITUATIONAL, SSET_TO_CLIENT,
N_("Minimum distance between cities"),
- N_("When a player founds a new city, it is checked if there is "
-"no other city in citymindist distance. For example, if "
-"citymindist is 3, there have to be at least two empty "
+ N_("Whe
Re: [Freeciv-Dev] (PR#39731) support for appended ruler titles
http://bugs.freeciv.org/Ticket/Display.html?id=39731 > Daniel Markstedt wrote: > On 9/27/07, Egor Vyscrebentsov <[EMAIL PROTECTED]> wrote: >> So, what do you want? A function which will return string contains >> leader name and title in proper order? > > Yes. After that, all clients have to be modified to use this function > instead of manually prepending titles. > Should this be based on the language of the user? Or the language of the title? A data driven design for the latter could be modifying the titles to have a %s where the leader name is properly placed. That should help with right to left languages, too. I'd also like to modify the data to pair leader name and sex. It's a minor nuisance, but counting is a bit of an annoyance. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] 2.1.0-beta7
On 9/22/07, William Allen Simpson <[EMAIL PROTECTED]> wrote: > Marko Lindqvist wrote: > > I hope beta7 to be last beta, and to that goal I would like to see > > just a couple of more problems fixed before it. I will list them > > later. > > > My take is that with a few more problems fixed, it should be ready, > based on the list of features that are its requirements: > > http://freeciv.wikia.com/wiki/TODO-2.1 > > No sense moving the goalposts. > Marko, could you please add to this todo list? We need to make this final spurt towards 2.1.0-final as transparent as possible. BTW, pepeto wrote about his take on Freeciv's outstanding issue at http://freeciv.wikia.com/wiki/User:Pepeto ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Use the Wiki as Forum
I simply renamed it 'Development'. Take a look at the forums again, the new sections should be working now, but please do test them: http://freeciv.wikia.com/wiki/Forum:Index Docs for the wiki extension behind this at http://www.mediawiki.org/wiki/Extension:DPLforum Can you think of any obviously missing features? Egor pointed out thread starter and number of threads in a forum, but at least the former seems to be implemented and can be activated by adding a parameter to a template. ~Daniel On 9/26/07, François Marlier <[EMAIL PROTECTED]> wrote: > "Developpers & Contributors Area" maybe ? > > Le 25 sept. 07 à 01:58, Daniel Markstedt a écrit : > > > I guess the dev part is 'Contribution' - though it is ambiguously > > named. Could you think of a better label? > > > > ~Daniel > > > > On 9/24/07, François Marlier <[EMAIL PROTECTED]> wrote: > >> just great (in my case it means I can finaly access the freeciv > >> forum !) > >> can we have a dev part (or is a freeciv dev forum still existing??) > >> > >> Francois > >> > >> Le 24 sept. 07 à 16:25, Daniel Markstedt a écrit : > >> > >>> Check out the wiki forum - I have expanded it to roughly fill the > >>> functions of our phpbb: > >>> > >>> http://freeciv.wikia.com/wiki/Forum:Index > >>> > >>> What could stop us from locking the old forums and direct users > >>> here? > >>> > >>> ~Daniel > >>> > >>> ___ > >>> 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#39731) support for appended ruler titles
http://bugs.freeciv.org/Ticket/Display.html?id=39731 > On 9/27/07, Egor Vyscrebentsov <[EMAIL PROTECTED]> wrote: > > 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 > Yes. After that, all clients have to be modified to use this function instead of manually prepending titles. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39730) [CleanUp] Server allows bribe cheating
http://bugs.freeciv.org/Ticket/Display.html?id=39730 >
I see this line in server/diplomat.c in diplomat_bribe():
if (pvictim->bribe_cost == -1) {
freelog (LOG_ERROR, "Bribe cost -1 in diplomat_bribe by %s",
pplayer->name);
pvictim->bribe_cost = unit_bribe_cost (pvictim);
}
I was wondering where was calculated this value, I found it in
server/unithand.c in handle_unit_bribe_inq():
void handle_unit_bribe_inq(struct connection *pc, int unit_id)
{
struct player *pplayer = pc->player;
struct unit *punit = find_unit_by_id(unit_id);
if (pplayer && punit) {
punit->bribe_cost = unit_bribe_cost(punit);
dsend_packet_unit_bribe_info(pc, unit_id, punit->bribe_cost);
}
}
So this value is calculated only when you ask the bribe cost to the
server. With a hacked client, it's very easy to don't ask a such info.
Then the value is not calculated (produce a LOG_ERROR) or is an old
value (dangerous). This should be recalculated in diplomat_bribe() to
work properly.
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39720) ottoman nation patch
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
