[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth ./Doxyfile data/scenarios/Eastern_Invas...
|
From: |
Yann Dirson |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth ./Doxyfile data/scenarios/Eastern_Invas... |
|
Date: |
Wed, 04 May 2005 18:56:16 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <address@hidden> 05/05/04 22:56:15
Modified files:
. : Doxyfile
data/scenarios/Eastern_Invasion: deaths.cfg intro.cfg
data/scenarios/Heir_To_The_Throne: deaths.cfg intro.cfg
data/scenarios/Son_Of_The_Black_Eye: deaths.cfg story.cfg
utils.cfg
data/scenarios/The_Dark_Hordes: intro.cfg
data/scenarios/The_Rise_of_Wesnoth: trow-deaths.cfg
trow-intro.cfg
trow-macros.cfg
trow-nlmsg.cfg
trow-nohome.cfg
trow-noisle.cfg
po : Makefile.in.in
utils : wmlxgettext
Log message:
Added --domain (and --initialdomain) to wmlxgettext, to select the
single textdomain to extract from the files. It is not really complete (not
knowing about the WML scope of #textdomain, and assuming textual scope), but
sufficient for now. Changed default string-extraction rules to use --domain.
Added #textdomain in "library" wml files from standard campaigns, in places
where it would be missing should those files be #included from different
campaigns, but mostly so their strings get extracted.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/Doxyfile.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/deaths.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/intro.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/deaths.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/intro.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/Makefile.in.in.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/utils/wmlxgettext.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
Patches:
Index: wesnoth/Doxyfile
diff -u wesnoth/Doxyfile:1.1 wesnoth/Doxyfile:1.2
--- wesnoth/Doxyfile:1.1 Tue Feb 3 01:31:01 2004
+++ wesnoth/Doxyfile Wed May 4 22:56:14 2005
@@ -978,7 +978,7 @@
# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
-HAVE_DOT = NO
+HAVE_DOT = YES
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
Index: wesnoth/data/scenarios/Eastern_Invasion/deaths.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/deaths.cfg:1.6
wesnoth/data/scenarios/Eastern_Invasion/deaths.cfg:1.7
--- wesnoth/data/scenarios/Eastern_Invasion/deaths.cfg:1.6 Mon Feb 28
23:56:56 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/deaths.cfg Wed May 4 22:56:15 2005
@@ -1,4 +1,5 @@
[event]
+ #textdomain wesnoth-ei
name=die
[filter]
description=Gweddry
@@ -14,6 +15,7 @@
[/event]
[event]
+ #textdomain wesnoth-ei
name=die
[filter]
description=Dacyn
@@ -29,6 +31,7 @@
[/event]
[event]
+ #textdomain wesnoth-ei
name=die
[filter]
description=Owaec
@@ -43,6 +46,7 @@
[/event]
[event]
+ #textdomain wesnoth-ei
name=die
[filter]
description=Engineer
Index: wesnoth/data/scenarios/Eastern_Invasion/intro.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/intro.cfg:1.8
wesnoth/data/scenarios/Eastern_Invasion/intro.cfg:1.9
--- wesnoth/data/scenarios/Eastern_Invasion/intro.cfg:1.8 Sun Feb 13
15:37:29 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/intro.cfg Wed May 4 22:56:15 2005
@@ -1,5 +1,6 @@
# XXX add all story graphics
[story]
+ #textdomain wesnoth-ei
[part]
music=wesnoth-1
story= _ "It was the thirtieth year of Konrad II's reign, and there
were strange events happening on the eastern border of Wesnoth."
Index: wesnoth/data/scenarios/Heir_To_The_Throne/deaths.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/deaths.cfg:1.3
wesnoth/data/scenarios/Heir_To_The_Throne/deaths.cfg:1.4
--- wesnoth/data/scenarios/Heir_To_The_Throne/deaths.cfg:1.3 Tue Jan 11
01:18:20 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/deaths.cfg Wed May 4
22:56:15 2005
@@ -1,4 +1,5 @@
[event]
+ #textdomain wesnoth-httt
name=die
[filter]
description=Konrad
@@ -13,6 +14,7 @@
[/event]
[event]
+ #textdomain wesnoth-httt
name=die
[filter]
description=Li'sar
@@ -28,6 +30,7 @@
[/event]
[event]
+ #textdomain wesnoth-httt
name=die
[filter]
description=Kalenz
@@ -41,6 +44,7 @@
[/endlevel]
[/event]
[event]
+ #textdomain wesnoth-httt
name=die
[filter]
description=Delfador
Index: wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg:1.9
wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg:1.10
--- wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg:1.9 Wed Apr 13
11:55:32 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg Wed May 4 22:56:15 2005
@@ -1,4 +1,5 @@
[story]
+ #textdomain wesnoth-httt
[part]
music=wesnoth-1.ogg
story= _ "In the twenty-seventh year of the reign of Garard II, king of
Wesnoth, the kingdom was plunged into a bitter war with the Peoples of the
North."
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:1.8
wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:1.9
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:1.8 Wed Apr 13
11:55:33 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg Wed May 4
22:56:15 2005
@@ -5,6 +5,7 @@
#enddef
[event]
+#textdomain wesnoth-sotbe
name=die
[filter]
type=Orcish Shaman
@@ -21,6 +22,7 @@
[/event]
[event]
+#textdomain wesnoth-sotbe
name=die
[filter]
type=Old Orcish Shaman
@@ -37,6 +39,7 @@
[/event]
[event]
+#textdomain wesnoth-sotbe
name=die
[filter]
type=Novice Orcish Shaman
@@ -53,6 +56,7 @@
[/event]
[event]
+#textdomain wesnoth-sotbe
name=die
[filter]
type=Orcish Priest Doctor
@@ -69,6 +73,7 @@
[/event]
[event]
+#textdomain wesnoth-sotbe
name=die
[filter]
description=Kapou'e
@@ -81,6 +86,7 @@
[/event]
[event]
+#textdomain wesnoth-sotbe
name=die
[filter]
description=Grüü
@@ -93,6 +99,7 @@
[/event]
[event]
+#textdomain wesnoth-sotbe
name=die
[filter]
description=Inarix
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg:1.12
wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg:1.13
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg:1.12 Wed Apr 13
11:55:33 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg Wed May 4
22:56:15 2005
@@ -1,4 +1,5 @@
[story]
+#textdomain wesnoth-sotbe
[part]
story= _ "Rahul I, King of Wesnoth, concluded peace with orcs in the
4th year of his reign. He ended a 15 year war with Black Eye Karun, ruler of
the orcs. A peace treaty defined which lands were devoted to orcs or humans.
Years that followed the treaty were prosperous."
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg:1.9
wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg:1.10
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg:1.9 Wed Feb 16
01:02:04 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg Wed May 4
22:56:15 2005
@@ -188,6 +188,7 @@
#define PIRATE_GALLEON X Y
[unit]
+ #textdomain wesnoth-sotbe
side=3
description=_ "Pirate Galleon"
type=Pirate Galleon
Index: wesnoth/data/scenarios/The_Dark_Hordes/intro.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/intro.cfg:1.5
wesnoth/data/scenarios/The_Dark_Hordes/intro.cfg:1.6
--- wesnoth/data/scenarios/The_Dark_Hordes/intro.cfg:1.5 Sun Aug 8
00:40:41 2004
+++ wesnoth/data/scenarios/The_Dark_Hordes/intro.cfg Wed May 4 22:56:15 2005
@@ -1,4 +1,5 @@
[story]
+ #textdomain wesnoth-tdh
[part]
id=undead_intro_1
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg:1.9
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg:1.10
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg:1.9 Mon Mar
28 21:35:57 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg Wed May 4
22:56:15 2005
@@ -1,4 +1,5 @@
[event]
+ #textdomain wesnoth-trow
name=die
[filter]
description=Prince Haldric
@@ -13,6 +14,7 @@
[/event]
[event]
+ #textdomain wesnoth-trow
name=die
[filter]
description=King Eldaric IV
@@ -27,6 +29,7 @@
[/event]
[event]
+ #textdomain wesnoth-trow
name=die
[filter]
description=Lady Jessica
@@ -41,6 +44,7 @@
[/event]
[event]
+ #textdomain wesnoth-trow
name=die
[filter]
description=Lady Outlaw
@@ -56,6 +60,7 @@
[/event]
[event]
+ #textdomain wesnoth-trow
name=die
[filter]
description=Burin the Lost
@@ -67,6 +72,7 @@
[/event]
[event]
+ #textdomain wesnoth-trow
name=die
[filter]
description=Sir Ruddry
@@ -79,6 +85,7 @@
[/event]
[event]
+ #textdomain wesnoth-trow
name=die
[filter]
description=Sir Ladoc
@@ -91,6 +98,7 @@
[/event]
[event]
+ #textdomain wesnoth-trow
name=die
[filter]
description=Minister Edmond
@@ -103,7 +111,8 @@
[/event]
[event]
- name=die
+ #textdomain wesnoth-trow
+ name=die
[filter]
description=Lord Typhon
[/filter]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:1.13
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:1.14
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:1.13 Fri Apr
22 16:34:26 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg Wed May 4
22:56:15 2005
@@ -1,4 +1,5 @@
[story]
+ #textdomain wesnoth-trow
[part]
music=underground.ogg
story= _ "In the days before Haldric the First saved our people, and
founded the kingdom of Wesnoth, we came from an Isle far to the West..."
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.15
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.16
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.15 Thu Apr
14 08:12:05 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg Wed May 4
22:56:15 2005
@@ -15,6 +15,7 @@
[/gold]
[message]
+ #textdomain wesnoth-trow
speaker=narrator
message= _ "You retrieve {AMOUNT} pieces of gold."
[/message]
@@ -91,6 +92,7 @@
#ifdef EASY
[unit]
+ #textdomain wesnoth-trow
description=A Former Friend
user_description= _ "A Former Friend"
type=Walking Corpse
@@ -106,6 +108,7 @@
#endif
#ifdef NORMAL
[unit]
+ #textdomain wesnoth-trow
description=A Former Friend
user_description= _ "A Former Friend"
type=Soulless
@@ -121,6 +124,7 @@
#endif
#ifdef HARD
[unit]
+ #textdomain wesnoth-trow
description=A Former Friend
user_description= _ "A Former Friend"
type=Ghoul
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg:1.7
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg:1.8
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg:1.7 Mon Mar
28 21:35:57 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg Wed May 4
22:56:15 2005
@@ -1,4 +1,5 @@
[event]
+ #textdomain wesnoth-trow
name=turn 6
[if]
[variable]
@@ -19,6 +20,7 @@
[/event]
[event]
+ #textdomain wesnoth-trow
name=turn 3
[if]
[variable]
@@ -40,6 +42,7 @@
[/event]
[event]
+ #textdomain wesnoth-trow
name=turn 2
[if]
[variable]
@@ -60,6 +63,7 @@
[/event]
[event]
+ #textdomain wesnoth-trow
name=turn 5
[if]
[variable]
@@ -76,6 +80,7 @@
[/event]
[event]
+ #textdomain wesnoth-trow
name=turn 7
[if]
[variable]
@@ -96,6 +101,7 @@
[/event]
[event]
+ #textdomain wesnoth-trow
name=turn 2
[if]
[variable]
@@ -117,6 +123,7 @@
#Incorporate the return of the fleet in final scenarios
#[event]
+# #textdomain wesnoth-trow
# name=turn 2
# [if]
# [variable]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg:1.9
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg:1.10
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg:1.9 Fri Apr
22 16:34:26 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg Wed May 4
22:56:15 2005
@@ -1,4 +1,5 @@
[story]
+ #textdomain wesnoth-trow
[part]
music=underground.ogg
story= _ "So it came to pass that Price Haldric was forced from his
home, never to return. With the help of his father's noble sacrifice he has
escaped the Southern pass. Haldric has left the lands of his home, and before
him stretches the vast expanse of the southern kingdoms of his people."
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg:1.7
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg:1.8
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg:1.7 Sun Jan
9 21:35:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg Wed May 4
22:56:15 2005
@@ -1,4 +1,5 @@
[story]
+ #textdomain wesnoth-trow
[part]
music=underground.ogg
story= _ "Several days later Prince Haldric departs in his ship the
Eldaric, his home and Isle lost to him forever. In his heart he knows he will
never see his secluded valley again. Before him lay a vast expanse of stormy
seas, and the mysterious island that Lady Jessica has mentioned, and even more
exotic lands even further to the East."
Index: wesnoth/po/Makefile.in.in
diff -u wesnoth/po/Makefile.in.in:1.23 wesnoth/po/Makefile.in.in:1.24
--- wesnoth/po/Makefile.in.in:1.23 Sat Feb 19 12:21:23 2005
+++ wesnoth/po/Makefile.in.in Wed May 4 22:56:15 2005
@@ -117,7 +117,7 @@
sed s/charset=CHARSET/charset=UTF-8/ $(DOMAIN).cpp.po >
$(DOMAIN).cpp1.po ;\
fi
if test -r $(srcdir)/FINDCFG ;\
- then ${WMLXGETTEXT} --directory=$(top_srcdir) \
+ then ${WMLXGETTEXT} --directory=$(top_srcdir) --domain=$(DOMAIN) \
`cd $(top_srcdir) && sh $(subdir)/FINDCFG` > $(DOMAIN).wml.po ;\
fi
if test -f $(DOMAIN).wml.po -a -f $(DOMAIN).cpp1.po ; then \
Index: wesnoth/utils/wmlxgettext
diff -u wesnoth/utils/wmlxgettext:1.14 wesnoth/utils/wmlxgettext:1.15
--- wesnoth/utils/wmlxgettext:1.14 Thu Nov 25 10:34:47 2004
+++ wesnoth/utils/wmlxgettext Wed May 4 22:56:15 2005
@@ -9,7 +9,13 @@
use Getopt::Long;
our $toplevel = '.';
-GetOptions ('directory=s' => \$toplevel);
+our $initialdomain = 'wesnoth';
+our $domain = undef;
+GetOptions ('directory=s' => \$toplevel,
+ 'initialdomain=s' => \$initialdomain,
+ 'domain=s' => \$domain);
+
+$domain = $initialdomain unless defined $domain;
our $module = dirname ($0) . "/wmltrans.pm";
eval "require \"$module\";";
@@ -21,11 +27,19 @@
foreach my $file (@ARGV) {
open (FILE, "<$file") or die "cannot read from $file";
my $readingattack = 0;
-
+ my @domainstack = ($initialdomain);
LINE: while (<FILE>) {
- # skip comments
+ # change the current textdomain when hitting the directive
+ if (m/\s*\#textdomain\s+(\S+)/) {
+ unshift @domainstack, $1;
+ next LINE;
+ }
+
+ # skip other # lines as comments
next LINE if m/^\s*\#/ and !defined $str;
+ next LINE unless $domainstack[0] eq $domain;
+
if (!defined $str and m/^(?:[^\"]*?)((?:_\s*)?)\"([^\"]*)\"(.*)/) {
# single-line quoted string
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth ./Doxyfile data/scenarios/Eastern_Invas...,
Yann Dirson <=