Added German translation to internat sample.

  Fixed recursion in wxLogGui::Flush()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index d9ab6ce490297cc4a878f953118f35945f65f1fb..8f344173c40bcab2b5b53a3989dbfdbb338bfd78 100755 (executable)
--- a/configure
+++ b/configure
@@ -11924,6 +11924,7 @@ trap 'rm -fr `echo "
            samples/drawing/Makefile
            samples/dynamic/Makefile
            samples/image/Makefile
+           samples/internat/Makefile
            samples/layout/Makefile
            samples/listctrl/Makefile
            samples/mdi/Makefile
@@ -12125,6 +12126,7 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config
            samples/drawing/Makefile
            samples/dynamic/Makefile
            samples/image/Makefile
+           samples/internat/Makefile
            samples/layout/Makefile
            samples/listctrl/Makefile
            samples/mdi/Makefile

diff --git a/configure.in b/configure.in
index 824dbb9050745561bd44369ba8918bcb09036ee7..7d556f41b735a3357576af15ae0cd667f2cb3e73 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2783,6 +2783,7 @@ AC_OUTPUT([
            samples/drawing/Makefile
            samples/dynamic/Makefile
            samples/image/Makefile
+           samples/internat/Makefile
            samples/layout/Makefile
            samples/listctrl/Makefile
            samples/mdi/Makefile

diff --git a/samples/internat/.cvsignore b/samples/internat/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/internat/.cvsignore
+++ b/samples/internat/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/internat/Makefile.am b/samples/internat/Makefile.am
deleted file mode 100644 (file)
index afef5a1..0000000
--- a/samples/internat/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = internat
-
-internat_SOURCES = internat.cpp

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
new file mode 100644 (file)
index 0000000..4350957
--- /dev/null
+++ b/samples/internat/Makefile.in
@@ -0,0 +1,28 @@
+#
+# File:                Makefile
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for internat example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+program_dir = samples/internat
+
+DATAFILES=fr/internat.po fr/internat.mo \
+       de/internat.po de/internat.mo \
+       fr/wxstd.po fr/wxstd.mo \
+       de/wxstd.po de/wxstd.mo
+
+DATADIRS=fr de
+
+PROGRAM=internat
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

diff --git a/samples/internat/de/internat.mo b/samples/internat/de/internat.mo
new file mode 100644 (file)
index 0000000..c5adfd9
Binary files /dev/null and b/samples/internat/de/internat.mo differ

diff --git a/samples/internat/de/internat.po b/samples/internat/de/internat.po
new file mode 100644 (file)
index 0000000..e0001ad
--- /dev/null
+++ b/samples/internat/de/internat.po
@@ -0,0 +1,79 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 1999-08-28 16:46+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: ../internat.cpp:120
+msgid "International wxWindows App"
+msgstr "Internationales wxWindows Programm"
+
+#: ../internat.cpp:128
+msgid "&About..."
+msgstr "Ü&ber"
+
+#: ../internat.cpp:130
+msgid "E&xit"
+msgstr "&Schließen"
+
+#: ../internat.cpp:133
+msgid "&Open bogus file"
+msgstr "Ö&ffne Unsinn-Datei"
+
+#: ../internat.cpp:134
+msgid "&Play a game"
+msgstr "Spiele ein S&piel"
+
+#: ../internat.cpp:137
+msgid "&File"
+msgstr "&Datei"
+
+#: ../internat.cpp:138
+msgid "&Test"
+msgstr "&Test"
+
+#: ../internat.cpp:161
+msgid ""
+"I18n sample\n"
+"© 1998, 1999 Vadim Zeitlin and Julian Smart"
+msgstr "I18n Beispiel\n"
+"© 1998, 1999 Vadim Zeitlin and Julian Smart"
+
+#: ../internat.cpp:163
+msgid "About Internat"
+msgstr "Ü&ber Internat"
+
+#: ../internat.cpp:168
+msgid "Enter your number:"
+msgstr "Geben Sie eine Nummer ein:"
+
+#: ../internat.cpp:169
+msgid "Try to guess my number!"
+msgstr "Versuchen Sie, die Nummer zu raten"
+
+#: ../internat.cpp:177
+msgid "You've probably entered an invalid number."
+msgstr "Sie haben wahrscheinlich eine ungültige Nummer eingegeben"
+
+#: ../internat.cpp:185
+msgid "Congratulations! you've won. Here is the magic phrase:"
+msgstr "Herzlichen Glückwunsch, Sie haben gewonnen. Hier ist der magische Satz:"
+
+#: ../internat.cpp:186
+#, c-format
+msgid "cannot create fifo `%s'"
+msgstr "Der Fifo `%s' kan nicht erzeugt werden"
+
+#: ../internat.cpp:189
+msgid "Result"
+msgstr "Ergebnis"

diff --git a/samples/internat/de/wxstd.mo b/samples/internat/de/wxstd.mo
new file mode 100644 (file)
index 0000000..a33dc0a
Binary files /dev/null and b/samples/internat/de/wxstd.mo differ

diff --git a/samples/internat/de/wxstd.po b/samples/internat/de/wxstd.po
new file mode 100644 (file)
index 0000000..febe280
--- /dev/null
+++ b/samples/internat/de/wxstd.po
@@ -0,0 +1,136 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 1997-12-19 17:46+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#: file.cpp:182 hello.cpp:38
+#, fuzzy, c-format
+msgid "can't create file '%s'"
+msgstr "Kann die Datei '%s' nicht erzeugen."
+
+#: file.cpp:213
+#, c-format
+msgid "can't open file '%s'"
+msgstr "Kann die Datei '%s' nicht öffnen."
+
+#: file.cpp:227
+#, c-format
+msgid "can't close file descriptor %d"
+msgstr "Kann den Datei-Deskriptor %d nicht schließen."
+
+#: file.cpp:244
+#, c-format
+msgid "can't read from file descriptor %d"
+msgstr "Kann nicht vom Datei-Deskriptor %d lesen."
+
+#: file.cpp:258
+#, c-format
+msgid "can't write to file descriptor %d"
+msgstr "Kann nicht in den Datei-Deskriptor %d schreiben."
+
+#: file.cpp:271
+#, c-format
+msgid "can't flush file descriptor %d"
+msgstr "Kann keinen flush-Befehl für den Datei-Deskriptor %d ausführen."
+
+#: file.cpp:308
+#, c-format
+msgid "can't seek on file descriptor %d"
+msgstr "Kann den Datei-Deskriptor %d nicht positionieren."
+
+#: file.cpp:322
+#, c-format
+msgid "can't get seek position on file descriptor %d"
+msgstr "Kann die Position des Datei Deskriptors %d nicht herausfinden."
+
+#: file.cpp:355
+#, c-format
+msgid "can't find length of file on file descriptor %d"
+msgstr ""
+
+#: intl.cpp:139
+#, c-format
+msgid "catalog file for domain '%s' not found."
+msgstr ""
+
+#: intl.cpp:177
+#, c-format
+msgid "'%s' is not a valid message catalog."
+msgstr ""
+
+#: intl.cpp:330 intl.cpp:334
+#, c-format
+msgid "locale '%s' can not be set."
+msgstr "Die Lokale '%s' kann nicht benutzt werden."
+
+#: intl.cpp:431 intl.cpp:435
+#, c-format
+msgid "string '%s' not found in domain '%s' for locale '%s'."
+msgstr "Die Zeichenkette '%s' der Domäne '%s' für die Lokale '%s' kann nicht gefunden werden."
+
+#: intl.cpp:434 intl.cpp:438
+#, c-format
+msgid "string '%s' not found in locale '%s'."
+msgstr ""
+
+#: log.cpp:104
+#, c-format
+msgid " (error %ld: %s)"
+msgstr " (Fehler %ld: %s)"
+
+#: log.cpp:165
+msgid "Debug: "
+msgstr "Debug: "
+
+#: log.cpp:171
+msgid "Fatal error: "
+msgstr "Fataler Fehler: "
+
+#: log.cpp:172
+msgid "Program aborted.\n"
+msgstr "Programm beendet.\n"
+
+#: log.cpp:177
+msgid "Error: "
+msgstr "Fehler: "
+
+#: log.cpp:181
+msgid "Warning: "
+msgstr "Warnung: "
+
+#: log.cpp:268
+#, c-format
+msgid "Assert failed in file %s at line %d"
+msgstr ""
+
+#: file.cpp:303
+msgid "unknown seek origin"
+msgstr "Unbekannter Positionsanfang."
+
+msgid "looking for catalog '%s' in path '%s'."
+msgstr ""
+
+#: intl.cpp:378
+msgid "no message catalog list"
+msgstr "Keine Nachrichten Katalog."
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "Abbruch"

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index c191d764107697b766500e288741a2e065a15b0c..437d7d7b61dc2189ba754001cf4d8a98bc4270f3 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -61,7 +61,7 @@ public:
 // ID for the menu commands
 enum
 {
-  MINIMAL_QUIT,
+  MINIMAL_QUIT = 1,
   MINIMAL_TEXT,
   MINIMAL_ABOUT,
   MINIMAL_TEST,
@@ -114,11 +114,11 @@ bool MyApp::OnInit()
   /* this catalog is installed in standard location on Linux systems,
      it might not be installed on yours - just ignore the errrors
      or comment out this line then */
-  m_locale.AddCatalog("fileutils");  // 3) and another just for testing
+//  m_locale.AddCatalog("fileutils");  // 3) and another just for testing
   
   // Create the main frame window
   MyFrame *frame = new MyFrame((wxFrame *) NULL, _("International wxWindows App"),
-                               50, 50, 250, 40);
+                               50, 50, 350, 60);
 
   // Give it an icon
   frame->SetIcon(wxICON(mondrian));

diff --git a/samples/internat/makefile.unx b/samples/internat/makefile.unx
deleted file mode 100644 (file)
index f5db8b1..0000000
--- a/samples/internat/makefile.unx
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for internat example (UNIX).
-
-PROGRAM=internat
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

diff --git a/samples/internat/readme.txt b/samples/internat/readme.txt
index 1e5f58b0e388c6cb88b2aecd96e3cb0b15dd9e10..a08085c4bcc2aedc7ff3ddf005daa612dd204893 100644 (file)
--- a/samples/internat/readme.txt
+++ b/samples/internat/readme.txt
@@ -44,7 +44,7 @@ A. First of all, you will need the GNU gettext tools (see the next question).
 
    # generate the .po file for the program itself
    # see `xgettext --help' for options, "-C" is important!
-   xgettext -C -o internat.po ../internat.cpp
+   xgettext -C -n -k_ -o internat.po ../internat.cpp
    
    # .po file for wxWindows might be generated in the same way, but for now just
    # take this one...
@@ -60,7 +60,7 @@ A. First of all, you will need the GNU gettext tools (see the next question).
 
    # run the sample to test it
    cd ..
-   ./$OSTYPE/internat <language> <langid>
+   ./internat <language> <langid>
 
 Q. How to get the gettext tools?
 A. For Unix, you should be able to get the source distribution of any GNU mirror

diff --git a/src/common/log.cpp b/src/common/log.cpp
index b29f583649afc0aa2c334349249e351a8c2e4db9..34391202ed6c860fe50dea0e325bc551c9b9d078 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -507,6 +507,9 @@ void wxLogGui::Flush()
 
     // no undisplayed messages whatsoever
     Clear();
+    
+    // do it here again
+    m_bHasMessages = FALSE;
 }
 
 // the default behaviour is to discard all informational messages if there