Commit a84e6d1b 几米阳光

增加中英文资源

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