ecere/i18n: Fixed broken build by taking i18n out of instance.ec; Date & Months i18n...

diff --git a/compiler/bootstrap/ecere/bootstrap/instance.c b/compiler/bootstrap/ecere/bootstrap/instance.c
index d641033..4c17fed 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/instance.c
+++ b/compiler/bootstrap/ecere/bootstrap/instance.c
@@ -1367,8 +1367,6 @@ static void __ecereNameSpace__ecere__com__FreeTemplatesDerivatives(struct __ecer
 
 extern int printf(char * , ...);
 
-extern char *  __ecereNameSpace__ecere__GetTranslatedString(struct __ecereNameSpace__ecere__com__Instance * module, char *  string, char *  stringAndContext);
-
 static void __ecereNameSpace__ecere__com__NameSpace_Free(struct __ecereNameSpace__ecere__com__NameSpace * parentNameSpace);
 
 static struct __ecereNameSpace__ecere__com__BTNamedLink * __ecereNameSpace__ecere__com__SearchNameSpace(struct __ecereNameSpace__ecere__com__NameSpace * nameSpace, char *  name, void *  listOffset);
@@ -1522,7 +1520,7 @@ __ecereNameSpace__ecere__com__FreeTemplatesDerivatives(_class);
 if(!_class->internalDecl)
 {
 if(declMode != 4)
-printf(__ecereNameSpace__ecere__GetTranslatedString(__thisModule, "error: Redefinition of class %s\n", (((void *)0))), name);
+printf("error: Redefinition of class %s\n", name);
 else
 {
 _class->comRedefinition = 0x1;

diff --git a/compiler/libec/src/pass16.ec b/compiler/libec/src/pass16.ec
index bd27241..1cc4d0f 100644 (file)
--- a/compiler/libec/src/pass16.ec
+++ b/compiler/libec/src/pass16.ec
@@ -1481,7 +1481,7 @@ static void ProcessExpression(Expression exp)
                   exp.expType = MkClassType(revConvert._class.fullName);
                }/*
                else
-                  printf("Error: Couldn't find member %s in class %s\n", 
+                  printf($"Error: Couldn't find member %s in class %s\n", 
                      exp.member.member.string, _class.name);*/
             }
          }

diff --git a/compiler/libec/src/pass2.ec b/compiler/libec/src/pass2.ec
index a588c4d..0a8275f 100644 (file)
--- a/compiler/libec/src/pass2.ec
+++ b/compiler/libec/src/pass2.ec
@@ -1511,7 +1511,7 @@ static void ProcessExpression(Expression exp)
                Class arrayClass = eSystem_FindClass(privateModule, "Array");
                if(source && eClass_IsDerived(source._class.registered, arrayClass))
                   isArray = true;
-               if(isArray)
+               if(isArray && _class.templateArgs)
                {
                   OldList * specs = MkList();
                   Declarator decl = SpecDeclFromString(_class.templateArgs[2].dataTypeString, specs, null);

diff --git a/ecere/locale/zh_CN/LC_MESSAGES/ecere.mo b/ecere/locale/zh_CN/LC_MESSAGES/ecere.mo
index 7f5d18b..ae416d8 100644 (file)
Binary files a/ecere/locale/zh_CN/LC_MESSAGES/ecere.mo and b/ecere/locale/zh_CN/LC_MESSAGES/ecere.mo differ

diff --git a/ecere/locale/zh_CN/LC_MESSAGES/ecere.po b/ecere/locale/zh_CN/LC_MESSAGES/ecere.po
index ef0e847..82c4908 100644 (file)
--- a/ecere/locale/zh_CN/LC_MESSAGES/ecere.po
+++ b/ecere/locale/zh_CN/LC_MESSAGES/ecere.po
@@ -66,10 +66,26 @@ msgstr "Alt+"
 msgid "Appearance"
 msgstr "外观"
 
+#: .\src\sys\Date.ec:24
+msgid "Apr"
+msgstr "四月"
+
+#: .\src\sys\Date.ec:15
+msgid "April"
+msgstr "四月"
+
 #: .\src\gui\dialogs\FileDialog.ec:1188
 msgid "As Type:"
 msgstr "类型(T):"
 
+#: .\src\sys\Date.ec:24
+msgid "Aug"
+msgstr "八月"
+
+#: .\src\sys\Date.ec:15
+msgid "August"
+msgstr "八月"
+
 #: .\src\gui\controls\Button.ec:856
 #: .\src\gui\controls\Button.ec:909
 #: .\src\gui\controls\Button.ec:932
@@ -176,7 +192,7 @@ msgstr "Control contains other controls. Delete control and children?"
 msgid "Copy\tCtrl+C"
 msgstr "复制(C)\tCtrl+C"
 
-#: .\src\sys\System.ec:110
+#: .\src\sys\System.ec:111
 msgid "Couldn't write to file"
 msgstr "无法写入文件"
 
@@ -216,6 +232,14 @@ msgstr "剪切(X)\tCtrl+X"
 msgid "Data"
 msgstr "数据"
 
+#: .\src\sys\Date.ec:25
+msgid "Dec"
+msgstr "十二月"
+
+#: .\src\sys\Date.ec:16
+msgid "December"
+msgstr "十二月"
+
 #: .\src\gfx\Color.ec:735
 #, fuzzy
 msgid "Defined"
@@ -297,6 +321,14 @@ msgstr "写入文件错误"
 msgid "Exp"
 msgstr "Exp"
 
+#: .\src\sys\Date.ec:24
+msgid "Feb"
+msgstr "二月"
+
+#: .\src\sys\Date.ec:15
+msgid "February"
+msgstr "二月"
+
 #: .\src\gui\dialogs\FileDialog.ec:1065
 msgid "File Already Exists"
 msgstr "文件已存在"
@@ -306,7 +338,7 @@ msgstr "文件已存在"
 msgid "File Name:"
 msgstr "文件名:"
 
-#: .\src\sys\System.ec:108
+#: .\src\sys\System.ec:109
 msgid "File not found"
 msgstr "文件未找到"
 
@@ -341,6 +373,14 @@ msgstr "查找内容(N):"
 msgid "Find...\tCtrl+F"
 msgstr "查找(F)...\tCtrl+F"
 
+#: .\src\sys\Date.ec:20
+msgid "Fri"
+msgstr "星期五"
+
+#: .\src\sys\Date.ec:11
+msgid "Friday"
+msgstr "星期五"
+
 #: .\src\gui\controls\EditBox.ec:672
 #: .\src\gui\dialogs\GoToDialog.ec:29
 #: .\src\gui\dialogs\GoToDialog.ec:35
@@ -359,7 +399,7 @@ msgstr "跳至(G)...\tCtrl+G"
 msgid "Graphics driver not supported by any user interface system"
 msgstr "图形驱动不支持任何用户界面"
 
-#: .\src\sys\System.ec:106
+#: .\src\sys\System.ec:107
 msgid "Identic string identifier already exists"
 msgstr "已存在相同的字符串标识符"
 
@@ -376,7 +416,7 @@ msgstr "图片文件(*.jpg, *.jpeg, *.bmp, *.pcx, *.png, *.gif)"
 msgid "Imp"
 msgstr "Imp"
 
-#: .\src\sys\System.ec:105
+#: .\src\sys\System.ec:106
 msgid "Inexistant string identifier specified"
 msgstr "不存在指定的字符串标识符"
 
@@ -384,6 +424,30 @@ msgstr "不存在指定的字符串标识符"
 msgid "Insert Tabs"
 msgstr "插入制表符(I)"
 
+#: .\src\sys\Date.ec:24
+msgid "Jan"
+msgstr "一月"
+
+#: .\src\sys\Date.ec:15
+msgid "January"
+msgstr "一月"
+
+#: .\src\sys\Date.ec:24
+msgid "Jul"
+msgstr "七月"
+
+#: .\src\sys\Date.ec:15
+msgid "July"
+msgstr "七月"
+
+#: .\src\sys\Date.ec:24
+msgid "Jun"
+msgstr "六月"
+
+#: .\src\sys\Date.ec:15
+msgid "June"
+msgstr "六月"
+
 #: .\src\gui\Window.ec:7661
 #: .\src\gui\Window.ec:8031
 #: .\src\gui\Window.ec:8038
@@ -405,6 +469,14 @@ msgstr "行号:"
 msgid "Look in:"
 msgstr "浏览(L):"
 
+#: .\src\sys\Date.ec:24
+msgid "Mar"
+msgstr "三月"
+
+#: .\src\sys\Date.ec:15
+msgid "March"
+msgstr "三月"
+
 #: .\src\gui\dialogs\FindDialog.ec:31
 #: .\src\gui\dialogs\ReplaceDialog.ec:229
 msgid "Match case"
@@ -414,7 +486,17 @@ msgstr "区分大小写(C)"
 msgid "Maximize"
 msgstr "最大化(X)"
 
-#: .\src\sys\System.ec:104
+#: .\src\sys\Date.ec:15
+msgctxt "LongMonthNames"
+msgid "May"
+msgstr "五月"
+
+#: .\src\sys\Date.ec:24
+msgctxt "ShortMonthNames"
+msgid "May"
+msgstr "五月"
+
+#: .\src\sys\System.ec:105
 msgid "Memory allocation failed"
 msgstr "内存分配失败"
 
@@ -427,6 +509,14 @@ msgstr "Microsoft Windows Network"
 msgid "Minimize"
 msgstr "最小化(N)"
 
+#: .\src\sys\Date.ec:20
+msgid "Mon"
+msgstr "星期一"
+
+#: .\src\sys\Date.ec:11
+msgid "Monday"
+msgstr "星期一"
+
 #: .\src\gui\Window.ec:6588
 msgid "Move"
 msgstr "移动(M)"
@@ -445,7 +535,7 @@ msgstr "新建文件夹"
 msgid "No"
 msgstr "否(N)"
 
-#: .\src\sys\System.ec:103
+#: .\src\sys\System.ec:104
 #: .\src\gui\GuiApplication.ec:91
 msgid "No error"
 msgstr "没有错误"
@@ -454,6 +544,14 @@ msgstr "没有错误"
 msgid "No such line."
 msgstr "没有这行."
 
+#: .\src\sys\Date.ec:24
+msgid "Nov"
+msgstr "十一月"
+
+#: .\src\sys\Date.ec:15
+msgid "November"
+msgstr "十一月"
+
 #: .\src\gui\dialogs\ColorPicker.ec:721
 #: .\src\gui\dialogs\FileDialog.ec:295
 #: .\src\gui\dialogs\FileDialog.ec:1226
@@ -465,6 +563,14 @@ msgstr "没有这行."
 msgid "OK"
 msgstr "OK"
 
+#: .\src\sys\Date.ec:24
+msgid "Oct"
+msgstr "十月"
+
+#: .\src\sys\Date.ec:15
+msgid "October"
+msgstr "十月"
+
 #: .\src\gui\dialogs\FileDialog.ec:1256
 msgid "Open"
 msgstr "打开(O)"
@@ -480,6 +586,7 @@ msgstr "请输入名称."
 
 #: .\src\gui\controls\DropBox.ec:98
 #: .\src\gui\controls\ListBox.ec:890
+#, fuzzy
 msgid "Private"
 msgstr "Private"
 
@@ -516,6 +623,14 @@ msgstr "替换(R)...\tCtrl+R"
 msgid "Restore"
 msgstr "恢复(R)"
 
+#: .\src\sys\Date.ec:21
+msgid "Sat"
+msgstr "星期六"
+
+#: .\src\sys\Date.ec:12
+msgid "Saturday"
+msgstr "星期六"
+
 #: .\src\gui\Window.ec:7191
 msgid "Save As"
 msgstr "另存为"
@@ -606,7 +721,15 @@ msgstr "创建目录吗?"
 msgid "Selection"
 msgstr "已选中内容(S)"
 
-#: .\src\sys\System.ec:107
+#: .\src\sys\Date.ec:24
+msgid "Sep"
+msgstr "九月"
+
+#: .\src\sys\Date.ec:15
+msgid "September"
+msgstr "九月"
+
+#: .\src\sys\System.ec:108
 msgid "Shared library loading failed"
 msgstr "共享库加载失败"
 
@@ -624,6 +747,14 @@ msgstr "大小(S)"
 msgid "Stay On Top"
 msgstr "置顶(T)"
 
+#: .\src\sys\Date.ec:20
+msgid "Sun"
+msgstr "星期日"
+
+#: .\src\sys\Date.ec:11
+msgid "Sunday"
+msgstr "星期日"
+
 #: .\src\gfx\Color.ec:755
 #, fuzzy
 msgid "System"
@@ -637,6 +768,22 @@ msgstr "System"
 msgid "Tahoma"
 msgstr "Tahoma"
 
+#: .\src\sys\Date.ec:20
+msgid "Thu"
+msgstr "星期四"
+
+#: .\src\sys\Date.ec:11
+msgid "Thursday"
+msgstr "星期四"
+
+#: .\src\sys\Date.ec:20
+msgid "Tue"
+msgstr "星期二"
+
+#: .\src\sys\Date.ec:11
+msgid "Tuesday"
+msgstr "星期二"
+
 #: .\src\gui\dialogs\FileDialog.ec:1410
 msgid "Type"
 msgstr "类型"
@@ -657,6 +804,14 @@ msgstr "向上(U)"
 msgid "Verdana"
 msgstr "Verdana"
 
+#: .\src\sys\Date.ec:20
+msgid "Wed"
+msgstr "星期三"
+
+#: .\src\sys\Date.ec:11
+msgid "Wednesday"
+msgstr "星期三"
+
 #: .\src\gui\dialogs\ReplaceDialog.ec:241
 msgid "Whole File"
 msgstr "整个文件(H)"
@@ -698,7 +853,7 @@ msgstr "窗口"
 msgid "Yes"
 msgstr "是(Y)"
 
-#: .\src\sys\System.ec:426
+#: .\src\sys\System.ec:427
 msgid ""
 "\n"
 "\n"
@@ -708,6 +863,32 @@ msgstr ""
 "\n"
 "你想查看错误日志吗?"
 
+#: .\src\sys\Date.ec:64
+#: .\src\sys\Time.ec:779
+msgid "now"
+msgstr "现在"
+
+#: .\src\sys\Date.ec:63
+#: .\src\sys\Time.ec:778
+msgid "today"
+msgstr "今日"
+
+#: .\src\sys\Date.ec:65
+#: .\src\sys\Date.ec:69
+#: .\src\sys\Time.ec:781
+msgid "tomorrow"
+msgstr "明天"
+
+#: .\src\sys\Date.ec:66
+#: .\src\sys\Date.ec:74
+#: .\src\sys\Time.ec:788
+msgid "yesterday"
+msgstr "昨天"
+
+#, fuzzy
+#~ msgid "error: Redefinition of class %s\n"
+#~ msgstr "error: Redefinition of class %s\n"
+
 #~ msgid " - Logging Errors...\n"
 #~ msgstr " - 写日志错...\n"
 

diff --git a/ecere/src/com/instance.ec b/ecere/src/com/instance.ec
index 20ce704..e0c8484 100644 (file)
--- a/ecere/src/com/instance.ec
+++ b/ecere/src/com/instance.ec
@@ -4,7 +4,6 @@ import "BinaryTree"
 import "OldList"
 import "String"
 import "dataTypes"
-import "i18n"
 
 #if defined(ECERE_BOOTSTRAP) || defined(ECERE_STATIC)
 #define dllexport
@@ -2278,7 +2277,8 @@ public dllexport Class eSystem_RegisterClass(ClassType type, char * name, char *
          if(!_class.internalDecl)
          {
             if(declMode != baseSystemAccess)
-               printf($"error: Redefinition of class %s\n", name);
+               // i18n in instance.ec is more trouble than it's worth.
+               printf("error: Redefinition of class %s\n", name);
             else
             {
                _class.comRedefinition = true;

diff --git a/ecere/src/gui/controls/CalendarControl.ec b/ecere/src/gui/controls/CalendarControl.ec
index 0fd2a1b..3981d6c 100644 (file)
--- a/ecere/src/gui/controls/CalendarControl.ec
+++ b/ecere/src/gui/controls/CalendarControl.ec
@@ -239,7 +239,10 @@ private:
 
          surface.SetForeground(black);
          for(d = sunday; d <= saturday; d++)
-            surface.CenterTextf(Width / 2 + d * Width, 0, "%c", toupper(daysNames[d][0]));
+         {
+            String s = shortDaysNames[d];
+            surface.CenterTextf(Width / 2 + d * Width, 0, "%c", toupper(s[0]));
+         }
 
          surface.SetBackground(Color { 238, 238, 238 } /*whiteSmoke*/);
          surface.Area(0, Height, Width, clientSize.h);

diff --git a/ecere/src/sys/Date.ec b/ecere/src/sys/Date.ec
index 207fc7c..b007b89 100644 (file)
--- a/ecere/src/sys/Date.ec
+++ b/ecere/src/sys/Date.ec
@@ -1,18 +1,28 @@
 namespace sys;
 
+import "i18n"
 import "System"
 import "CalendarControl"
 
 #define ISLEAP(y) (!((y)%4) && (((y) % 100) || (!((y)% 400))))
 
-/*static */const char longDaysNames[7][10] =
-{
-   "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
-};
-/*static */const char longMonthsNames[12][10] = 
-{
-   "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
-};
+/*static */Array<String> longDaysNames
+{ [
+   $"Sunday", $"Monday", $"Tuesday", $"Wednesday", $"Thursday", $"Friday", $"Saturday"
+] };
+/*static */Array<String> longMonthsNames
+{ [
+   $"January", $"February", $"March", $"April", $"LongMonthNames"."May", $"June", $"July", $"August", $"September", $"October", $"November", $"December"
+] };
+
+/*static */Array<String> shortDaysNames
+{ [
+   $"Sun", $"Mon", $"Tue", $"Wed", $"Thu", $"Fri", $"Sat"
+] };
+/*static */Array<String> shortMonthsNames
+{ [
+   $"Jan", $"Feb", $"Mar", $"Apr", $"ShortMonthNames"."May", $"Jun", $"Jul", $"Aug", $"Sep", $"Oct", $"Nov", $"Dec"
+] };
 public enum Month { january, february, march, april, may, june, july, august, september, october, november, december };
 
 default:
@@ -29,14 +39,6 @@ public struct Date
    {
       if(stringOutput)
       {
-         static const char days[7][4] =
-         {
-            "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-         };
-         static const char months[12][4] = 
-         {
-            "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-         };
          if(day && year)
             sprintf(stringOutput, "%s, %s %2d, %d", 
                longDaysNames[dayOfTheWeek], longMonthsNames[month], day, year);
@@ -58,16 +60,18 @@ public struct Date
       int count = 0;
       time.GetLocalTime();
 
-      if(!strcmpi(string, "today") || !strcmpi(string, "now") || 
-         !strcmpi(string, "tomorrow") || !strcmpi(string, "yesterday"))
+      if(!strcmpi(string, "today") || !strcmpi(string, $"today") ||
+         !strcmpi(string, "now") || !strcmpi(string, $"now") || 
+         !strcmpi(string, "tomorrow") || !strcmpi(string, $"tomorrow") ||
+         !strcmpi(string, "yesterday") || !strcmpi(string, $"yesterday"))
       {
          SecSince1970 weWant;
-         if(!strcmpi(string, "tomorrow"))
+         if(!strcmpi(string, "tomorrow") || !strcmpi(string, $"tomorrow"))
          {
             weWant = (SecSince1970)time + 24 * 60 * 60;
             time = (DateTime)weWant;
          }
-         else if(!strcmpi(string, "yesterday"))
+         else if(!strcmpi(string, "yesterday") || !strcmpi(string, $"yesterday"))
          {
             weWant = (SecSince1970)time - 24 * 60 * 60;
             time = (DateTime)weWant;
@@ -100,7 +104,7 @@ public struct Date
             {            
                Month c;
                for(c = 0; c<Month::enumSize; c++)
-                  if(!strnicmp(monthsNames[c], value, 3))
+                  if(!strnicmp(shortMonthsNames[c], value, 3))
                   {
                      month = c;
                      gotAlphaMonth = true;

diff --git a/ecere/src/sys/Time.ec b/ecere/src/sys/Time.ec
index 4167734..b1c80ea 100644 (file)
--- a/ecere/src/sys/Time.ec
+++ b/ecere/src/sys/Time.ec
@@ -1,7 +1,5 @@
 namespace sys;
 
-import "instance"
-
 #define Date _Date
 #define uint _uint
 #define Method _Method
@@ -40,6 +38,8 @@ import "instance"
 #undef Size
 #undef Date
 
+import "instance"
+
 define EPOCH_YEAR      = 1970;
 define EPOCH_WEEKDAY   = thursday;
 static define SECS_PER_HOUR   = 60 * 60;
@@ -63,15 +63,6 @@ int monthLengths[2][12] =
        { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
 };
 
-char daysNames[7][4] =
-{
-   "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-char monthsNames[12][4] = 
-{
-   "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
 #if defined(__WIN32__)
 
 #define LL2FILETIME( ll, pft )   (pft)->dwLowDateTime = (UINT)(ll); (pft)->dwHighDateTime = (UINT)((ll) >> 32);
@@ -680,7 +671,7 @@ public struct DateTime
          stringOutput[0] = 0;
       else
          sprintf(stringOutput, "%s %s %2d %2d:%02d:%02d %s %04d", 
-            daysNames[dayOfTheWeek], monthsNames[month], day, hour, minute, second, ampm[pm], year);
+            shortDaysNames[dayOfTheWeek], shortMonthsNames[month], day, hour, minute, second, ampm[pm], year);
 
       return stringOutput;
    }
@@ -704,12 +695,12 @@ public struct DateTime
       {
          int i;
          for(i = 0; i<7; i++) 
-            if(!strcmpi(tokens[c], daysNames[i]) || !strcmpi(tokens[c], longDaysNames[i]))
+            if(!strcmpi(tokens[c], shortDaysNames[i]) || !strcmpi(tokens[c], longDaysNames[i]))
                break;               
          if(i < 7) { dayOfTheWeek = (DayOfTheWeek)i; foundDayOfTheWeek = true; continue; }
 
          for(i = 0; i<12; i++) 
-            if(!strcmpi(tokens[c], monthsNames[i]) || !strcmpi(tokens[c], longMonthsNames[i]))
+            if(!strcmpi(tokens[c], shortMonthsNames[i]) || !strcmpi(tokens[c], longMonthsNames[i]))
                break;               
          if(i < 12) { month = (Month)i; continue; }
 
@@ -784,16 +775,17 @@ public struct DateTime
          weWant = (SecSince1970)this + (int)(dayOfTheWeek - this.dayOfTheWeek) * 24 * 60 * 60;
          this = (DateTime)weWant;
       }
-      else if(!strcmpi(s, "today") || !strcmpi(s, "now"))
+      else if(!strcmpi(s, "today") || !strcmpi(s, $"today") ||
+              !strcmpi(s, "now") || !strcmpi(s, $"now"))
          GetLocalTime();
-      else if(!strcmpi(s, "tomorrow"))
+      else if(!strcmpi(s, "tomorrow") || !strcmpi(s, $"tomorrow"))
       {
          SecSince1970 weWant;
          GetLocalTime();
          weWant = (SecSince1970)this + 24 * 60 * 60;
          this = (DateTime)weWant;
       }
-      else if(!strcmpi(s, "yesterday"))
+      else if(!strcmpi(s, "yesterday") || !strcmpi(s, $"yesterday"))
       {
          SecSince1970 weWant;
          GetLocalTime();

diff --git a/ide/locale/zh_CN/LC_MESSAGES/ide.mo b/ide/locale/zh_CN/LC_MESSAGES/ide.mo
index c45eec8..2a56dfa 100644 (file)
Binary files a/ide/locale/zh_CN/LC_MESSAGES/ide.mo and b/ide/locale/zh_CN/LC_MESSAGES/ide.mo differ

diff --git a/ide/locale/zh_CN/LC_MESSAGES/ide.po b/ide/locale/zh_CN/LC_MESSAGES/ide.po
index e32a908..4af8370 100644 (file)
--- a/ide/locale/zh_CN/LC_MESSAGES/ide.po
+++ b/ide/locale/zh_CN/LC_MESSAGES/ide.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: ecere\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2012-02-19 13:54+0900\n"
+"PO-Revision-Date: 2012-02-19 21:14+0900\n"
 "Last-Translator: Jerome St-Louis <jerome@ecere.com>\n"
 "Language-Team: ec <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -639,6 +639,11 @@ msgstr "描述(A)"
 msgid "Design & Implementation"
 msgstr "Design & Implementation"
 
+#: .\src\designer\Designer.ec:143
+#, fuzzy
+msgid "Designer"
+msgstr "查看设计器(D)"
+
 #: .\src\designer\Sheet.ec:523
 #: .\src\designer\Sheet.ec:529
 msgid "Detach"
@@ -773,6 +778,7 @@ msgstr "常规错误: 子进程异常终止\n"
 
 #: .\src\project\ProjectView.ec:443
 #: .\src\designer\CodeEditor.ec:1884
+#: .\src\designer\Designer.ec:150
 #: .\src\documents\PictureEdit.ec:53
 #: .\src\ide.ec:483
 #: .\src\ide.ec:2471
@@ -1531,6 +1537,7 @@ msgstr "相同项目"
 #: .\src\project\ProjectView.ec:250
 #: .\src\project\ProjectView.ec:444
 #: .\src\designer\CodeEditor.ec:1885
+#: .\src\designer\Designer.ec:153
 #: .\src\documents\PictureEdit.ec:54
 #: .\src\ide.ec:532
 msgid "Save"
@@ -1541,6 +1548,7 @@ msgid "Save All"
 msgstr "全部保存(L)"
 
 #: .\src\designer\CodeEditor.ec:1886
+#: .\src\designer\Designer.ec:161
 #: .\src\documents\PictureEdit.ec:55
 #: .\src\ide.ec:533
 msgid "Save As..."

diff --git a/ide/src/designer/Designer.ec b/ide/src/designer/Designer.ec
index c1b9092..12b4164 100644 (file)
--- a/ide/src/designer/Designer.ec
+++ b/ide/src/designer/Designer.ec
@@ -140,17 +140,17 @@ class Designer : DesignerBase
    hasClose = true;
    hasMaximize = true;
    hasMinimize = true;
-   text = "Designer";
+   text = $"Designer";
    menu = Menu { };
    anchor = Anchor { left = 300, right = 150, top = 0, bottom = 0 };
 
    ToolBox toolBox;
    CodeEditor codeEditor;
 
-   Menu fileMenu { menu, "File", f };
+   Menu fileMenu { menu, $"File", f };
    MenuItem fileSaveItem
    {
-      fileMenu, "Save", s, ctrlS;
+      fileMenu, $"Save", s, ctrlS;
       bool NotifySelect(MenuItem selection, Modifiers mods)
       {
          return codeEditor.MenuFileSave(selection, mods);
@@ -158,7 +158,7 @@ class Designer : DesignerBase
    };
    MenuItem fileSaveAsItem
    {
-      fileMenu, "Save As...", a;
+      fileMenu, $"Save As...", a;
       bool NotifySelect(MenuItem selection, Modifiers mods)
       {
          return codeEditor.MenuFileSaveAs(selection, mods);