changeset 156:36df0ffe34d2

Fix to reload translations.
author Diggory Hardy <diggory.hardy@gmail.com>
date Sat, 18 Apr 2009 21:51:03 +0200
parents 4e8819b65882
children a86f8445ccc8
files .hgignore codeDoc/jobs.txt data/L10n/en.mtt data/L10n/fr.mtt mde/content/Translation.d mde/gui/widget/TextWidget.d
diffstat 6 files changed, 15 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Sat Apr 18 12:19:24 2009 +0200
+++ b/.hgignore	Sat Apr 18 21:51:03 2009 +0200
@@ -2,3 +2,4 @@
 dsss.last
 bin/*
 dsss_objs/*
+data/fonts
--- a/codeDoc/jobs.txt	Sat Apr 18 12:19:24 2009 +0200
+++ b/codeDoc/jobs.txt	Sat Apr 18 21:51:03 2009 +0200
@@ -10,10 +10,10 @@
 Also search for FIXME/NOTE/BUG/WARNING comment marks.
 3   GUI: up-clicks get passed as events and activate objects
 3   Too many redraws: mouse-over causes them
-3   Glyph 's' drawn incorrectly in release mode - ??
 3   Widget saving: how to deal with modifier functions, esp. when they discard parameters? Remove feature except for dimdata and handle gui editing separately?
-3   glBindTexture not working with non-0 index - perhaps use a higher level graphics library at some point.
 3   Windows compatibility - no registry support (useful to find path).
+2   First glyph drawn incorrectly in release mode - ??
+2   glBindTexture not working with non-0 index - perhaps use a higher level graphics library at some point.
 2   Popup help boxes on hover/right click to display content description.
 2   Options need a "level": simple options, for advanced users, for debugging only, etc.
 2   Command-line options for paths to by-pass normal path finding functionality.
--- a/data/L10n/en.mtt	Sat Apr 18 12:19:24 2009 +0200
+++ b/data/L10n/en.mtt	Sat Apr 18 21:51:03 2009 +0200
@@ -2,4 +2,4 @@
 !{en International English}
 <char[][]|depends=["en-GB"]>
 {MiscOptions}
-<entry|L10n={0:"Localization",1:"Specifies the language to use."}>
+<entry|l10n={0:"Localization",1:"Specifies the language to use."}>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/data/L10n/fr.mtt	Sat Apr 18 21:51:03 2009 +0200
@@ -0,0 +1,6 @@
+{MT01}
+!{fr French}
+<char[][]|depends=["en"]>
+{menus}
+<entry|main.quit={0:"Quitter"}>
+<entry|help={0:"Aider"}>
--- a/mde/content/Translation.d	Sat Apr 18 12:19:24 2009 +0200
+++ b/mde/content/Translation.d	Sat Apr 18 21:51:03 2009 +0200
@@ -75,6 +75,7 @@
     }
     
     private void load (char[] l10n) {
+	entries = null;		// clear, then re-read
         char[][] files = [loadedL10n];	// initial locale plus dependencies
         size_t read = 0;	// index in files of next file to read
         while (read < files.length) {
@@ -98,11 +99,10 @@
                 char[] symPrefix;
                 do {
                     if (isSecTag) {
-                        if (reader.section.length == 0) {
+                        if (reader.section.length == 0)
                             symPrefix = "";
-                            continue;
-                        }
-                        symPrefix = reader.section ~ '.';
+                        else
+			    symPrefix = reader.section ~ '.';
                     } else {
                         if (reader.tagType == "entry") {
                             char[] sym = symPrefix ~ reader.tagID;
--- a/mde/gui/widget/TextWidget.d	Sat Apr 18 12:19:24 2009 +0200
+++ b/mde/gui/widget/TextWidget.d	Sat Apr 18 21:51:03 2009 +0200
@@ -121,7 +121,7 @@
             parent.minHChange (this, mh);
     }
     Content content_;
-    int cIndex;
+    int cIndex = 0;
 }
 
 /// Text-box for editing a content's value. Generic − any AStringContent.