localization nearing completion

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@285 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index a5cee3e6d35959974a455f6e8e8567b5e2243636..588d4a3c48ce2d264a04292850b32ddbae861c1c 100644 (file)
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-27  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.9
+
+       * English.lproj/default.strings, French.lproj/default.strings:
+         dictionaries for labels
+
+       * SOGoUserHomePage.wox: replaced constant strings with labels
+
 2004-08-26  Helge Hess  <helge.hess@skyrix.com>
 
        * GNUmakefile.preamble: fixed superflous libjs (v0.9.8)

diff --git a/SOGo/Main/English.lproj/default.strings b/SOGo/Main/English.lproj/default.strings
new file mode 100644 (file)
index 0000000..1e1780f
--- /dev/null
+++ b/SOGo/Main/English.lproj/default.strings
@@ -0,0 +1,4 @@
+/* this file is in ISO-8859-1 format! */
+
+"Calendar"     = "Calendar";
+"Addressbook"  = "Addressbook";

diff --git a/SOGo/Main/French.lproj/default.strings b/SOGo/Main/French.lproj/default.strings
new file mode 100644 (file)
index 0000000..1e1780f
--- /dev/null
+++ b/SOGo/Main/French.lproj/default.strings
@@ -0,0 +1,4 @@
+/* this file is in ISO-8859-1 format! */
+
+"Calendar"     = "Calendar";
+"Addressbook"  = "Addressbook";

diff --git a/SOGo/Main/GNUmakefile b/SOGo/Main/GNUmakefile
index 1d3a0ddb2e775303bdf95fd275c840d16ccc0238..c8d62e6a9d45eea029691b8323b8fb0a52ca1b9c 100644 (file)
--- a/SOGo/Main/GNUmakefile
+++ b/SOGo/Main/GNUmakefile
@@ -26,7 +26,7 @@ sogod_RESOURCE_FILES +=       \
        SOGoGroupsPage.wox      \
 
 sogod_LOCALIZED_RESOURCE_FILES += \
-       Locale
+       Locale default.strings
 
 sogod_WEBSERVER_RESOURCE_FILES += 
 

diff --git a/SOGo/Main/SOGoUserHomePage.wox b/SOGo/Main/SOGoUserHomePage.wox
index 3ed2dbdc2e87fe2fd3e6cbcd3c28188c32842b30..c1697f92535b830c01e36b92372c7fabf4db2b2e 100644 (file)
--- a/SOGo/Main/SOGoUserHomePage.wox
+++ b/SOGo/Main/SOGoUserHomePage.wox
@@ -3,6 +3,7 @@
                xmlns:var="http://www.skyrix.com/od/binding"
                xmlns:const="http://www.skyrix.com/od/constant"
                xmlns:uix="OGo:uix"
+               xmlns:label="OGo:label"
                className="UIxPageFrame"
                title="SOGo User Homepage"
 >
@@ -12,7 +13,7 @@
   </h3>
 
   <ul>
-    <li><a href="Calendar/weekoverview">Calendar</a></li>
-    <li><a href="Contacts/"            >Contacts</a></li>
+    <li><a href="Calendar/" ><var:string label:value="Calendar" /></a></li>
+    <li><a href="Contacts/" ><var:string label:value="Addressbook" /></a></li>
   </ul>
 </var:component>

diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index 28292b549059af8a6800e33ac74ed5ab727067ed..81be7eb6e79defb0b93e0ca78f8a44c310c033c2 100644 (file)
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=8
+SUBMINOR_VERSION:=9

diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj
index 9f706c411b8432d41ad1b159d126862ccf3c075c..4985ef4943d40bfe7df940ca4b950627d5cf1c8c 100644 (file)
--- a/SOGo/SOGo.xcode/project.pbxproj
+++ b/SOGo/SOGo.xcode/project.pbxproj
@@ -60,6 +60,76 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
+               AD01376706DF6A59000910D8 = {
+                       children = (
+                               AD01376806DF6A59000910D8,
+                               AD01376906DF6A69000910D8,
+                       );
+                       isa = PBXVariantGroup;
+                       name = default.strings;
+                       path = "";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD01376806DF6A59000910D8 = {
+                       fileEncoding = 5;
+                       indentWidth = 8;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.plist.strings;
+                       name = English;
+                       path = English.lproj/default.strings;
+                       refType = 4;
+                       sourceTree = "<group>";
+                       tabWidth = 8;
+                       usesTabs = 1;
+               };
+               AD01376906DF6A69000910D8 = {
+                       fileEncoding = 5;
+                       indentWidth = 8;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.plist.strings;
+                       name = French;
+                       path = French.lproj/default.strings;
+                       refType = 4;
+                       sourceTree = "<group>";
+                       tabWidth = 8;
+                       usesTabs = 1;
+               };
+               AD01377406DF6BC7000910D8 = {
+                       children = (
+                               AD01377506DF6BC7000910D8,
+                               AD01377606DF6BE6000910D8,
+                       );
+                       isa = PBXVariantGroup;
+                       name = default.strings;
+                       path = "";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD01377506DF6BC7000910D8 = {
+                       fileEncoding = 5;
+                       indentWidth = 8;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.plist.strings;
+                       name = English;
+                       path = English.lproj/default.strings;
+                       refType = 4;
+                       sourceTree = "<group>";
+                       tabWidth = 8;
+                       usesTabs = 1;
+               };
+               AD01377606DF6BE6000910D8 = {
+                       fileEncoding = 5;
+                       indentWidth = 8;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.plist.strings;
+                       name = French;
+                       path = French.lproj/default.strings;
+                       refType = 4;
+                       sourceTree = "<group>";
+                       tabWidth = 8;
+                       usesTabs = 1;
+               };
                AD06608A06AC2F3F006525C9 = {
                        children = (
                                AD06608B06AC2F3F006525C9,
@@ -2066,6 +2136,7 @@
                                E87205F30692E3D00099CBBD,
                                E87205D70692E3D00099CBBD,
                                AD06608A06AC2F3F006525C9,
+                               AD01377406DF6BC7000910D8,
                                ADDF4E3C06DE4EA900C4E7F8,
                                ADDF4E3F06DE4EBB00C4E7F8,
                                ADDF4E3906DE4E9800C4E7F8,
@@ -2509,6 +2580,7 @@
                                E87207E60692E3D20099CBBD,
                                E87207470692E3D20099CBBD,
                                E87207C40692E3D20099CBBD,
+                               AD01376706DF6A59000910D8,
                                E8720A490692E4CE0099CBBD,
                                AD01374506DF6731000910D8,
                                E87207500692E3D20099CBBD,

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index 329b4053d7cc5bf6a9c2e94635bdfe04befc7721..c507d5b0fbe313368587e5a2631be67eb7f053e2 100644 (file)
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,3 +1,13 @@
+2004-08-27  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.21
+
+       * English.lproj/default.strings, French.lproj/default.strings:
+         dictionaries for labels
+
+       * UIxPageFrame.wox, UIxAppNavView.wox: replaced constant strings with
+         labels
+
 2004-08-27  Helge Hess  <helge.hess@skyrix.com>
 
        * started UIxSortButton (v0.9.20)

diff --git a/SOGo/UI/Common/English.lproj/default.strings b/SOGo/UI/Common/English.lproj/default.strings
new file mode 100644 (file)
index 0000000..fd9dd6c
--- /dev/null
+++ b/SOGo/UI/Common/English.lproj/default.strings
@@ -0,0 +1,6 @@
+/* this file is in ISO-8859-1 format! */
+
+"Calendar"     = "Calendar";
+"Addressbook"  = "Addressbook";
+
+"You are here" = "You are here";

diff --git a/SOGo/UI/Common/French.lproj/default.strings b/SOGo/UI/Common/French.lproj/default.strings
new file mode 100644 (file)
index 0000000..fd9dd6c
--- /dev/null
+++ b/SOGo/UI/Common/French.lproj/default.strings
@@ -0,0 +1,6 @@
+/* this file is in ISO-8859-1 format! */
+
+"Calendar"     = "Calendar";
+"Addressbook"  = "Addressbook";
+
+"You are here" = "You are here";

diff --git a/SOGo/UI/Common/GNUmakefile b/SOGo/UI/Common/GNUmakefile
index 72fd5e4086936d4a90caeb9ba20a59af00b66ac7..4806938e712238f3ec8f06be3aef2378c432190b 100644 (file)
--- a/SOGo/UI/Common/GNUmakefile
+++ b/SOGo/UI/Common/GNUmakefile
@@ -8,6 +8,8 @@ BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo
 
 CommonUI_PRINCIPAL_CLASS = CommonUIProduct
 
+CommonUI_LANGUAGES = English French
+
 CommonUI_OBJC_FILES +=         \
        CommonUIProduct.m       \
        UIxPageFrame.m          \
@@ -54,6 +56,9 @@ CommonUI_RESOURCE_FILES += \
        images/downward_sorted.gif \
        images/non_sorted.gif   \
 
+CommonUI_LOCALIZED_RESOURCE_FILES +=   \
+       default.strings                 \
+
 # make
 
 -include GNUmakefile.preamble

diff --git a/SOGo/UI/Common/UIxAppNavView.wox b/SOGo/UI/Common/UIxAppNavView.wox
index 2b4f1f8dd064aad77b8707aff96b6df52bd3b640..478265858bb9888828bbb1f64757feb020c5690d 100644 (file)
--- a/SOGo/UI/Common/UIxAppNavView.wox
+++ b/SOGo/UI/Common/UIxAppNavView.wox
@@ -3,9 +3,11 @@
       xmlns:var="http://www.skyrix.com/od/binding"
       xmlns:const="http://www.skyrix.com/od/constant"
       xmlns:rsrc="OGo:url"
+      xmlns:label="OGo:label"
       class="defaultfont"
 >
-  <b>You are here:</b><var:entity const:name="nbsp" />
+  <b><var:string label:value="You are here"
+     />:</b><var:entity const:name="nbsp" />
   <var:foreach list="navPathElements" item="element">
     <var:if condition="element" value="lastElement" const:negate="YES">
       <a var:href="element.url"><var:string value="element.name" /></a>

diff --git a/SOGo/UI/Common/UIxPageFrame.wox b/SOGo/UI/Common/UIxPageFrame.wox
index 0c6815eb5cbfac5e9b503f8985759201ab564a2e..283cab063cc519a7f82deae4117f8c426ae65897 100644 (file)
--- a/SOGo/UI/Common/UIxPageFrame.wox
+++ b/SOGo/UI/Common/UIxPageFrame.wox
@@ -24,8 +24,10 @@
           <table cellpadding="0" cellspacing="0" border="0" width="100%">
             <tr>
               <td valign="bottom" style="font-size: 10pt;">
-                <a var:href="calendarRootURL">Calendar</a> |
-                <a var:href="contactsRootURL">Addressbook</a>
+                <a var:href="calendarRootURL"
+                ><var:string label:value="Calendar" /></a> |
+                <a var:href="contactsRootURL"
+                ><var:string label:value="Addressbook" /></a>
               </td>
               <td align="right">
                 <a href="http://www.opengroupware.org:80/" target="OGo">

diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index 93c8cd1ddfe4862984d2fe8dffb82de3a02d010b..49f242e531df55a4ec8619c8424bdc414d69e19a 100644 (file)
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=19
+SUBMINOR_VERSION:=21