You've already forked linux-packaging-mono
Imported Upstream version 4.2.0.179
Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
committed by
Jo Shields
parent
aa7da660d6
commit
c042cd0c52
@@ -516,6 +516,8 @@ namespace System.Text
|
||||
break;
|
||||
default:
|
||||
result = (Encoding)(EncodingHelper.InvokeI18N ("GetEncoding", codepage));
|
||||
if (result == null)
|
||||
throw new NotSupportedException(Environment.GetResourceString("NotSupported_NoCodepageData", codepage));
|
||||
break;
|
||||
}
|
||||
#else
|
||||
@@ -709,7 +711,11 @@ namespace System.Text
|
||||
{
|
||||
get
|
||||
{
|
||||
#if MONO
|
||||
return (Environment.GetResourceStringEncodingName(m_codePage));
|
||||
#else
|
||||
return (Environment.GetResourceString("Globalization.cp_" + m_codePage));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user