Skip to content

刘韬 / SO815-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit a84e6d1b 由 几米阳光
选项

增加中英文资源

1 个父辈 c820a1a4
全部展开
内嵌 并排
正在显示 5 个修改的文件 包含 20 行增加 和 7 行删除
dll/CodeLibrary.dll
此文件类型无法预览
source/ACSingleStore/FrmStoreBox.cs
...@@ -99,7 +99,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -99,7 +99,7 @@ namespace OnlineStore.AutoInOutStore
} }
#endregion #endregion
private string WaitStart = ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动"); private string WaitStart = ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动");
private string dooropen = ResourceCulture.GetString(ResourceCulture.DoorOpen, " 前门未关"); private string dooropen = ResourceCulture.GetString(ResourceCulture.DoorHasOpen, " 前门未关");
private string HasWare = ResourceCulture.GetString(ResourceCulture.HasWare, " 叉子料盘检测有料，请检查"); private string HasWare = ResourceCulture.GetString(ResourceCulture.HasWare, " 叉子料盘检测有料，请检查");
private string StartAuto = ResourceCulture.GetString(ResourceCulture.StartAuto,"开始自动出入库"); private string StartAuto = ResourceCulture.GetString(ResourceCulture.StartAuto,"开始自动出入库");
private string StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, "停止自动出入库"); private string StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, "停止自动出入库");
...@@ -116,15 +116,23 @@ namespace OnlineStore.AutoInOutStore ...@@ -116,15 +116,23 @@ namespace OnlineStore.AutoInOutStore
warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告"); warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告");
WaitStart = ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动"); WaitStart = ResourceCulture.GetString(ResourceCulture.WaitStart, "等待启动");
dooropen = ResourceCulture.GetString(ResourceCulture.DoorOpen, " 前门未关"); dooropen = ResourceCulture.GetString(ResourceCulture.DoorHasOpen, " 前门未关");
HasWare = ResourceCulture.GetString(ResourceCulture.HasWare, " 叉子料盘检测有料，请检查"); HasWare = ResourceCulture.GetString(ResourceCulture.HasWare, " 叉子料盘检测有料，请检查");
StartAuto = ResourceCulture.GetString(ResourceCulture.StartAuto,StartAuto); StartAuto = ResourceCulture.GetString(ResourceCulture.StartAuto,StartAuto);
StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, StopAuto); StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, StopAuto);
AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库："); AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库：");
AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库："); AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
摄像机调试ToolStripMenuItem.Visible = CurrLanguage.Equals(ResourceCulture.China); //摄像机调试ToolStripMenuItem.Visible = CurrLanguage.Equals(ResourceCulture.China);
toolStripSeparator10.Visible = CurrLanguage.Equals(ResourceCulture.China); //toolStripSeparator10.Visible = CurrLanguage.Equals(ResourceCulture.China);
richTextBox1.Visible = CurrLanguage.Equals(ResourceCulture.China); if (CurrLanguage.Equals(ResourceCulture.China))
{
LogUtil.logBox = this.richTextBox1;
}
else
{
LogUtil.ClearLog();
LogUtil.logBox = null;
}
ToolStripItemCollection collection = menuStrip1.Items; ToolStripItemCollection collection = menuStrip1.Items;
......
source/ACSingleStore/ResourceCulture.cs
...@@ -29,7 +29,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -29,7 +29,7 @@ namespace OnlineStore.AutoInOutStore
{ {
ResourceControl.GetStrEvent += GetString; ResourceControl.GetStrEvent += GetString;
ResourceControl.GetStringEvent += GetString; ResourceControl.GetStringEvent += GetString;
CodeLibrary.CodeResourceControl.GetLanguageEvent += CodeResourceControl_GetLanguageEvent;
//UserFromControl.UserControlResource.GetStrEvent += GetString; //UserFromControl.UserControlResource.GetStrEvent += GetString;
//UserFromControl.UserControlResource.GetStringEvent += GetString; //UserFromControl.UserControlResource.GetStringEvent += GetString;
if (string.IsNullOrEmpty(name)) if (string.IsNullOrEmpty(name))
...@@ -40,6 +40,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -40,6 +40,11 @@ namespace OnlineStore.AutoInOutStore
Thread.CurrentThread.CurrentCulture = new CultureInfo(name); Thread.CurrentThread.CurrentCulture = new CultureInfo(name);
} }
private static string CodeResourceControl_GetLanguageEvent()
{
return CurrLanguage;
}
private static Assembly assembly = Assembly.GetExecutingAssembly(); private static Assembly assembly = Assembly.GetExecutingAssembly();
public static string GetString(string id,string defaultStr) public static string GetString(string id,string defaultStr)
{ {
...@@ -195,7 +200,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -195,7 +200,7 @@ namespace OnlineStore.AutoInOutStore
/// <summary> /// <summary>
/// 前门未关 /// 前门未关
/// </summary> /// </summary>
public static string DoorOpen = "DoorOpen"; public static string DoorHasOpen = "DoorHasOpen";
/// <summary> /// <summary>
/// 叉子料盘检测有料，请检查 /// 叉子料盘检测有料，请检查
/// </summary> /// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!