From ca47896204482bf4a6979e3838bf7f09f61cebeb Mon Sep 17 00:00:00 2001
From: giy <giy@omp-system.ru>
Date: Fri, 02 Sep 2022 14:16:56 +0300
Subject: [PATCH] Обновление до версии 2.9.0
---
QtVsTools.Package/Package/SR.cs | 53 ++++++++++++-----------------------------------------
1 files changed, 12 insertions(+), 41 deletions(-)
diff --git a/QtVsTools.Package/Package/SR.cs b/QtVsTools.Package/Package/SR.cs
index 8dd6c57..6bf9f44 100644
--- a/QtVsTools.Package/Package/SR.cs
+++ b/QtVsTools.Package/Package/SR.cs
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt VS Tools.
@@ -26,8 +26,6 @@
**
****************************************************************************/
-using System;
-using System.Globalization;
using System.Resources;
namespace QtVsTools
@@ -36,66 +34,39 @@
{
static SR loader;
readonly ResourceManager resources;
- static readonly Object obj = new Object();
+ static readonly object obj = new object();
- internal const string OK = "OK";
- internal const string Cancel = "Cancel";
-
- internal static CultureInfo appCultureInfo;
- internal static CultureInfo defaultCultureInfo;
-
- internal SR(int localeId)
+ internal SR()
{
- defaultCultureInfo = CultureInfo.GetCultureInfo("en");
- appCultureInfo = CultureInfo.GetCultureInfo(localeId);
- if (appCultureInfo.Name.StartsWith("en", StringComparison.Ordinal))
- appCultureInfo = null;
resources = new ResourceManager("QtVsTools.Package.Resources", GetType().Assembly);
}
- private static SR GetLoader(int localeId)
+ private static SR GetLoader()
{
if (loader == null) {
lock (obj) {
if (loader == null)
- loader = new SR(localeId);
+ loader = new SR();
}
}
return loader;
}
- private static CultureInfo Culture
- {
- get { return appCultureInfo; }
- }
-
public static string GetString(string name, params object[] args)
{
- var res = GetString(name);
- if (!string.IsNullOrEmpty(res) && args != null && args.Length > 0)
+ var sys = GetLoader();
+ if (sys == null)
+ return null;
+
+ var res = sys.resources.GetString(name, null);
+ if (args != null && args.Length > 0 && !string.IsNullOrEmpty(res))
return string.Format(res, args);
return res;
}
public static string GetString(string name)
{
- return GetString(name, QtVsToolsPackage.Instance);
- }
-
- public static string GetString(string name, QtVsToolsPackage vsixInstance)
- {
- var sys = GetLoader(vsixInstance.Dte.LocaleID);
- if (sys == null)
- return null;
-
- string result;
- try {
- result = sys.resources.GetString(name, Culture);
- } catch (Exception) {
- result = sys.resources.GetString(name, defaultCultureInfo);
- }
-
- return result;
+ return GetString(name, null);
}
}
}
--
Gitblit v1.9.1