diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-24 20:28:16 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-24 20:28:16 +0000 |
commit | 8eac1de04ecdfac95506819288feffd777b229ce (patch) | |
tree | bc7a3bb785ee4bb9fc1107ec63a7327d79bd075e /xml | |
parent | 82087cc5bdc6a10d000c34e87f1a66ef9c38b3ed (diff) | |
download | ellinika-8eac1de04ecdfac95506819288feffd777b229ce.tar.gz ellinika-8eac1de04ecdfac95506819288feffd777b229ce.tar.bz2 |
Revamp WARNING declarations.
* xml/pl/ellinika.xml <WARNING>: Use <IF>.
* xml/uk/ellinika.xml: Likewise.
* xml/ru/ellinika.xml: Likewise.
* xml/pl/Makefile.am (stamp-lingua): Define STATE
* xml/uk/Makefile.am: Likewise.
* xml/ru/Makefile.am: Likewise.
* xml/lingua.conf.in <IFEXP>,<EL:WARNING>: Remove.
* xml/Makefile.am (conf.sed): Revert r546.
git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@549 941c8c0f-9102-463b-b60b-cd22ce0e6858
Diffstat (limited to 'xml')
-rw-r--r-- | xml/Makefile.am | 9 | ||||
-rw-r--r-- | xml/lingua.conf.in | 13 | ||||
-rw-r--r-- | xml/pl/Makefile.am | 4 | ||||
-rw-r--r-- | xml/pl/ellinika.xml | 6 | ||||
-rw-r--r-- | xml/ru/Makefile.am | 4 | ||||
-rw-r--r-- | xml/ru/ellinika.xml | 7 | ||||
-rw-r--r-- | xml/uk/Makefile.am | 4 | ||||
-rw-r--r-- | xml/uk/ellinika.xml | 7 |
8 files changed, 17 insertions, 37 deletions
diff --git a/xml/Makefile.am b/xml/Makefile.am index 356c334..3ec5c4d 100644 --- a/xml/Makefile.am +++ b/xml/Makefile.am | |||
@@ -30,15 +30,6 @@ conf.sed: Makefile | |||
30 | echo 's,=PACKAGE_BUGREPORT=,$(PACKAGE_BUGREPORT),g' >> conf.sed | 30 | echo 's,=PACKAGE_BUGREPORT=,$(PACKAGE_BUGREPORT),g' >> conf.sed |
31 | echo 's,=PROD_URL=,$(PROD_URL),g' >> conf.sed | 31 | echo 's,=PROD_URL=,$(PROD_URL),g' >> conf.sed |
32 | echo 's,=EXP_URL=,$(EXP_URL),g' >> conf.sed | 32 | echo 's,=EXP_URL=,$(EXP_URL),g' >> conf.sed |
33 | if test "$(STATE)" = "EXP"; then \ | ||
34 | echo 's,=IFEXP=,,' >> conf.sed; \ | ||
35 | echo 's,=END IFEXP=,,' >> conf.sed; \ | ||
36 | echo '/=IFPROD=/,/=END IFPROD=/d' >> conf.sed; \ | ||
37 | else \ | ||
38 | echo 's,=IFPROD=,,' >> conf.sed; \ | ||
39 | echo 's,=END IFPROD=,,' >> conf.sed; \ | ||
40 | echo '/=IFEXP=/,/=END IFEXP=/d' >> conf.sed; \ | ||
41 | fi | ||
42 | 33 | ||
43 | lingua.conf: $(srcdir)/lingua.conf.in conf.sed | 34 | lingua.conf: $(srcdir)/lingua.conf.in conf.sed |
44 | sed -f conf.sed $(srcdir)/lingua.conf.in > $@ | 35 | sed -f conf.sed $(srcdir)/lingua.conf.in > $@ |
diff --git a/xml/lingua.conf.in b/xml/lingua.conf.in index 3cace9a..098d063 100644 --- a/xml/lingua.conf.in +++ b/xml/lingua.conf.in | |||
@@ -43,17 +43,6 @@ | |||
43 | (lingua:LANG args))))) | 43 | (lingua:LANG args))))) |
44 | (xmltrans:set-attr "LINGUA" "NEA" nea))) | 44 | (xmltrans:set-attr "LINGUA" "NEA" nea))) |
45 | 45 | ||
46 | (xmltrans:end-tag | ||
47 | "IFEXP" | ||
48 | (tag attr text) | ||
49 | =IFEXP= | ||
50 | text | ||
51 | =END IFEXP= | ||
52 | =IFPROD= | ||
53 | #f | ||
54 | =END IFPROD= | ||
55 | ) | ||
56 | |||
57 | (xmltrans:end-tag | 46 | (xmltrans:end-tag |
58 | "FOOTER" | 47 | "FOOTER" |
59 | (tag attr text) | 48 | (tag attr text) |
@@ -83,8 +72,6 @@ this notice is preserved.</p>\n" | |||
83 | 72 | ||
84 | )) | 73 | )) |
85 | 74 | ||
86 | (lingua:tag-ignore EL:WARNING) | ||
87 | |||
88 | (xmltrans:end-tag | 75 | (xmltrans:end-tag |
89 | "KATHAREVUSA" | 76 | "KATHAREVUSA" |
90 | (tag attr text) | 77 | (tag attr text) |
diff --git a/xml/pl/Makefile.am b/xml/pl/Makefile.am index 03f100e..c4a74ed 100644 --- a/xml/pl/Makefile.am +++ b/xml/pl/Makefile.am | |||
@@ -1,5 +1,5 @@ | |||
1 | # This file is part of Ellinika project. | 1 | # This file is part of Ellinika project. |
2 | # Copyright (C) 2006, 2007 Sergey Poznyakoff | 2 | # Copyright (C) 2006, 2007, 2010 Sergey Poznyakoff |
3 | # | 3 | # |
4 | # Ellinika is free software; you can redistribute it and/or modify | 4 | # Ellinika is free software; you can redistribute it and/or modify |
5 | # it under the terms of the GNU General Public License as published by | 5 | # it under the terms of the GNU General Public License as published by |
@@ -44,5 +44,5 @@ CLEANFILES=stamp-lingua | |||
44 | all: stamp-lingua | 44 | all: stamp-lingua |
45 | 45 | ||
46 | stamp-lingua: $(EXTRA_DIST) ../lingua.conf | 46 | stamp-lingua: $(EXTRA_DIST) ../lingua.conf |
47 | xmlt lingua --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua | 47 | xmlt lingua -D STATE=$(STATE) --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua |
48 | 48 | ||
diff --git a/xml/pl/ellinika.xml b/xml/pl/ellinika.xml index fc7e3a0..8dcd1f3 100644 --- a/xml/pl/ellinika.xml +++ b/xml/pl/ellinika.xml | |||
@@ -25,12 +25,12 @@ | |||
25 | </LOCALIZATION> | 25 | </LOCALIZATION> |
26 | 26 | ||
27 | <WARNING> | 27 | <WARNING> |
28 | <IFEXP> | 28 | <IF DEF="STATE" EQ="EXP"> |
29 | <PARA>Uwaga! To jest wersja eksperymentalna. Wersję stabilną | 29 | <PARA>Uwaga! To jest wersja eksperymentalna. Wersję stabilną |
30 | znajdziesz <XREF LIT="{THIS-REF}">tutaj</XREF>.</PARA> | 30 | znajdziesz <XREF LIT="{THIS-REF}">tutaj</XREF>.</PARA> |
31 | </IFEXP> | 31 | </IF> |
32 | </WARNING> | 32 | </WARNING> |
33 | 33 | ||
34 | <COPYRIGHT> | 34 | <COPYRIGHT> |
35 | <FOOTER VCS-ID="$Id$"> | 35 | <FOOTER VCS-ID="$Id$"> |
36 | Copyright <![CDATA[©]]> 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff | 36 | Copyright <![CDATA[©]]> 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff |
diff --git a/xml/ru/Makefile.am b/xml/ru/Makefile.am index 6b11f40..a4dcd1e 100644 --- a/xml/ru/Makefile.am +++ b/xml/ru/Makefile.am | |||
@@ -1,5 +1,5 @@ | |||
1 | # This file is part of Ellinika project. | 1 | # This file is part of Ellinika project. |
2 | # Copyright (C) 2004, 2007 Sergey Poznyakoff | 2 | # Copyright (C) 2004, 2007, 2010 Sergey Poznyakoff |
3 | # | 3 | # |
4 | # Ellinika is free software; you can redistribute it and/or modify | 4 | # Ellinika is free software; you can redistribute it and/or modify |
5 | # it under the terms of the GNU General Public License as published by | 5 | # it under the terms of the GNU General Public License as published by |
@@ -44,5 +44,5 @@ CLEANFILES=stamp-lingua | |||
44 | all: stamp-lingua | 44 | all: stamp-lingua |
45 | 45 | ||
46 | stamp-lingua: $(EXTRA_DIST) ../lingua.conf | 46 | stamp-lingua: $(EXTRA_DIST) ../lingua.conf |
47 | xmlt lingua --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua | 47 | xmlt lingua -D STATE=$(STATE) --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua |
48 | 48 | ||
diff --git a/xml/ru/ellinika.xml b/xml/ru/ellinika.xml index 76e8a82..65abe4d 100644 --- a/xml/ru/ellinika.xml +++ b/xml/ru/ellinika.xml | |||
@@ -25,9 +25,10 @@ | |||
25 | </LOCALIZATION> | 25 | </LOCALIZATION> |
26 | 26 | ||
27 | <WARNING> | 27 | <WARNING> |
28 | <IFEXP> | 28 | <IF DEF="STATE" EQ="EXP"> |
29 | <PARA>Предупреждение! Это - экспериментальная версия. Официальная версия <XREF LIT="{THIS-REF}">тут</XREF>.</PARA> | 29 | <PARA>Предупреждение! Это - экспериментальная версия. Официальная |
30 | </IFEXP> | 30 | версия <XREF LIT="{THIS-REF}">находится тут</XREF>.</PARA> |
31 | </IF> | ||
31 | </WARNING> | 32 | </WARNING> |
32 | 33 | ||
33 | <COPYRIGHT> | 34 | <COPYRIGHT> |
diff --git a/xml/uk/Makefile.am b/xml/uk/Makefile.am index 03f100e..c4a74ed 100644 --- a/xml/uk/Makefile.am +++ b/xml/uk/Makefile.am | |||
@@ -1,5 +1,5 @@ | |||
1 | # This file is part of Ellinika project. | 1 | # This file is part of Ellinika project. |
2 | # Copyright (C) 2006, 2007 Sergey Poznyakoff | 2 | # Copyright (C) 2006, 2007, 2010 Sergey Poznyakoff |
3 | # | 3 | # |
4 | # Ellinika is free software; you can redistribute it and/or modify | 4 | # Ellinika is free software; you can redistribute it and/or modify |
5 | # it under the terms of the GNU General Public License as published by | 5 | # it under the terms of the GNU General Public License as published by |
@@ -44,5 +44,5 @@ CLEANFILES=stamp-lingua | |||
44 | all: stamp-lingua | 44 | all: stamp-lingua |
45 | 45 | ||
46 | stamp-lingua: $(EXTRA_DIST) ../lingua.conf | 46 | stamp-lingua: $(EXTRA_DIST) ../lingua.conf |
47 | xmlt lingua --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua | 47 | xmlt lingua -D STATE=$(STATE) --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua |
48 | 48 | ||
diff --git a/xml/uk/ellinika.xml b/xml/uk/ellinika.xml index d5b4218..cb614b7 100644 --- a/xml/uk/ellinika.xml +++ b/xml/uk/ellinika.xml | |||
@@ -25,9 +25,10 @@ | |||
25 | </LOCALIZATION> | 25 | </LOCALIZATION> |
26 | 26 | ||
27 | <WARNING> | 27 | <WARNING> |
28 | <IFEXP> | 28 | <IF DEF="STATE" EQ="EXP"> |
29 | <PARA>Увага! Це експериментальна версія сайту. Офіційна версія <XREF LIT="{THIS-REF}">тут</XREF>.</PARA> | 29 | <PARA>Увага! Це експериментальна версія сайту. Офіційну |
30 | </IFEXP> | 30 | версію <XREF LIT="{THIS-REF}">дивись тут</XREF>.</PARA> |
31 | </IF> | ||
31 | </WARNING> | 32 | </WARNING> |
32 | 33 | ||
33 | <COPYRIGHT> | 34 | <COPYRIGHT> |