Update terminology used in comments and one variable
This commit is contained in:
Родитель
a9683cbbf3
Коммит
cda393844b
|
@ -372,7 +372,7 @@ namespace Mono.Addins.CecilReflector
|
|||
|
||||
bool CheckHasMonoAddinsReference (AssemblyDefinition adef)
|
||||
{
|
||||
// Maybe the assembly is already in the blacklist
|
||||
// Maybe the assembly is already in the disallowed list
|
||||
if (assembliesNotReferencingMonoAddins.Contains (adef.FullName))
|
||||
return false;
|
||||
|
||||
|
|
|
@ -146,7 +146,7 @@ namespace Mono.Addins.Description
|
|||
{
|
||||
locale = NormalizeLocale (locale);
|
||||
string lang = GetLocaleLang (locale);
|
||||
AddinProperty sameLangDifCountry = null;
|
||||
AddinProperty sameLangDifCountryRegion = null;
|
||||
AddinProperty sameLang = null;
|
||||
AddinProperty defaultLoc = null;
|
||||
|
||||
|
@ -155,18 +155,18 @@ namespace Mono.Addins.Description
|
|||
if (p.Locale == locale)
|
||||
return ParseString (p.Value);
|
||||
string plang = GetLocaleLang (p.Locale);
|
||||
if (plang == p.Locale && plang == lang) // No country specified
|
||||
if (plang == p.Locale && plang == lang) // No country/region specified
|
||||
sameLang = p;
|
||||
else if (plang == lang)
|
||||
sameLangDifCountry = p;
|
||||
sameLangDifCountryRegion = p;
|
||||
else if (p.Locale == null)
|
||||
defaultLoc = p;
|
||||
}
|
||||
}
|
||||
if (sameLang != null)
|
||||
return ParseString (sameLang.Value);
|
||||
else if (sameLangDifCountry != null)
|
||||
return ParseString (sameLangDifCountry.Value);
|
||||
else if (sameLangDifCountryRegion != null)
|
||||
return ParseString (sameLangDifCountryRegion.Value);
|
||||
else if (defaultLoc != null)
|
||||
return ParseString (defaultLoc.Value);
|
||||
else
|
||||
|
|
|
@ -76,7 +76,7 @@ namespace Mono.Addins.Localization
|
|||
string msg = (string) loc [id];
|
||||
if (msg == null) {
|
||||
if (cname.Length > 2) {
|
||||
// Try again without the country
|
||||
// Try again without the country/region
|
||||
cname = cname.Substring (0, 2);
|
||||
loc = (Hashtable) locales [cname];
|
||||
if (loc != null) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче