Author: lluis
Date: 2007-12-05 10:01:29 -0500 (Wed, 05 Dec 2007)
New Revision: 90769
Added:
trunk/mono-addins/Mono.Addins/Mono.Addins.Localization/IPluralAddinLocalizer.cs
Modified:
trunk/mono-addins/Mono.Addins/ChangeLog
trunk/mono-addins/Mono.Addins/Makefile.am
trunk/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextDomain.cs
trunk/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextLocalizer.cs
trunk/mono-addins/Mono.Addins/Mono.Addins.mdp
trunk/mono-addins/Mono.Addins/Mono.Addins/AddinLocalizer.cs
Log:
* Mono.Addins.Localization/GettextDomain.cs,
Mono.Addins.Localization/IPluralAddinLocalizer.cs,
Mono.Addins.Localization/GettextLocalizer.cs, Mono.Addins.mdp,
Mono.Addins/AddinLocalizer.cs, Makefile.am: Add support for plural
forms.
Modified: trunk/mono-addins/Mono.Addins/ChangeLog
===================================================================
--- trunk/mono-addins/Mono.Addins/ChangeLog 2007-12-05 14:57:32 UTC (rev
90768)
+++ trunk/mono-addins/Mono.Addins/ChangeLog 2007-12-05 15:01:29 UTC (rev
90769)
@@ -1,3 +1,11 @@
+2007-12-05 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * Mono.Addins.Localization/GettextDomain.cs,
+ Mono.Addins.Localization/IPluralAddinLocalizer.cs,
+ Mono.Addins.Localization/GettextLocalizer.cs, Mono.Addins.mdp,
+ Mono.Addins/AddinLocalizer.cs, Makefile.am: Add support for plural
+ forms.
+
2007-12-04 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* Mono.Addins.Localization/GettextDomain.cs: Fix bug in string
Modified: trunk/mono-addins/Mono.Addins/Makefile.am
===================================================================
--- trunk/mono-addins/Mono.Addins/Makefile.am 2007-12-05 14:57:32 UTC (rev
90768)
+++ trunk/mono-addins/Mono.Addins/Makefile.am 2007-12-05 15:01:29 UTC (rev
90769)
@@ -53,6 +53,7 @@
Mono.Addins.Localization/GettextLocalizer.cs \
Mono.Addins.Localization/IAddinLocalizer.cs \
Mono.Addins.Localization/IAddinLocalizerFactory.cs \
+ Mono.Addins.Localization/IPluralAddinLocalizer.cs \
Mono.Addins.Localization/NullLocalizer.cs \
Mono.Addins.Localization/StringResourceLocalizer.cs \
Mono.Addins.Localization/StringTableLocalizer.cs \
Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/AddinLocalizer.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/AddinLocalizer.cs 2007-12-05
14:57:32 UTC (rev 90768)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/AddinLocalizer.cs 2007-12-05
15:01:29 UTC (rev 90769)
@@ -34,10 +34,12 @@
public class AddinLocalizer
{
IAddinLocalizer localizer;
+ IPluralAddinLocalizer pluralLocalizer;
internal AddinLocalizer (IAddinLocalizer localizer)
{
this.localizer = localizer;
+ pluralLocalizer = localizer as IPluralAddinLocalizer;
}
public string GetString (string msgid)
@@ -49,5 +51,22 @@
{
return string.Format (localizer.GetString (msgid),
args);
}
+
+ public string GetPluralString (string msgid, string
defaultPlural, int n)
+ {
+ // If the localizer does not support plural forms, just
use GetString to
+ // get a translation. It is not correct to check 'n' in
this case because
+ // there is no guarantee that 'defaultPlural' will be
translated.
+
+ if (pluralLocalizer != null)
+ return pluralLocalizer.GetPluralString (msgid,
defaultPlural, n);
+ else
+ return GetString (msgid);
+ }
+
+ public string GetPluralString (string singular, string
defaultPlural, int n, params string[] args)
+ {
+ return string.Format (GetPluralString (singular,
defaultPlural, n), args);
+ }
}
}
Modified:
trunk/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextDomain.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextDomain.cs
2007-12-05 14:57:32 UTC (rev 90768)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextDomain.cs
2007-12-05 15:01:29 UTC (rev 90769)
@@ -45,6 +45,8 @@
static extern IntPtr bind_textdomain_codeset (IntPtr
domainname, IntPtr codeset);
[DllImport("intl")]
static extern IntPtr dgettext (IntPtr domainname, IntPtr
instring);
+ [DllImport("intl")]
+ static extern IntPtr dngettext (IntPtr domainname, IntPtr
instring, IntPtr plural, int n);
IntPtr ipackage;
@@ -93,6 +95,25 @@
}
}
+ public String GetPluralString (String singular, String
defaultPlural, int n)
+ {
+ IntPtr ints = StringToPtr (singular);
+ IntPtr intp = StringToPtr (defaultPlural);
+ try {
+ // gettext(3) returns the input pointer if no
translation is found
+ IntPtr r = dngettext (ipackage, ints, intp, n);
+ if (r == ints)
+ return singular;
+ if (r == intp)
+ return defaultPlural;
+ return PtrToString (r);
+ }
+ finally {
+ Marshal.FreeHGlobal (ints);
+ Marshal.FreeHGlobal (intp);
+ }
+ }
+
static IntPtr StringToPtr (string s)
{
if (s == null)
Modified:
trunk/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextLocalizer.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextLocalizer.cs
2007-12-05 14:57:32 UTC (rev 90768)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Localization/GettextLocalizer.cs
2007-12-05 15:01:29 UTC (rev 90769)
@@ -30,7 +30,7 @@
namespace Mono.Addins.Localization
{
- class GettextLocalizer: IAddinLocalizerFactory, IAddinLocalizer
+ class GettextLocalizer: IAddinLocalizerFactory, IAddinLocalizer,
IPluralAddinLocalizer
{
GettextDomain domain;
@@ -52,5 +52,11 @@
{
return domain.GetString (msgid);
}
+
+ public string GetPluralString (string singular, string
defaultPlural, int n)
+ {
+ return domain.GetPluralString (singular, defaultPlural,
n);
+ }
+
}
}
Added:
trunk/mono-addins/Mono.Addins/Mono.Addins.Localization/IPluralAddinLocalizer.cs
===================================================================
---
trunk/mono-addins/Mono.Addins/Mono.Addins.Localization/IPluralAddinLocalizer.cs
2007-12-05 14:57:32 UTC (rev 90768)
+++
trunk/mono-addins/Mono.Addins/Mono.Addins.Localization/IPluralAddinLocalizer.cs
2007-12-05 15:01:29 UTC (rev 90769)
@@ -0,0 +1,36 @@
+// IPluralAddinLocalizer.cs
+//
+// Author:
+// Lluis Sanchez Gual <[EMAIL PROTECTED]>
+//
+// Copyright (c) 2007 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+
+using System;
+
+namespace Mono.Addins.Localization
+{
+ public interface IPluralAddinLocalizer
+ {
+ string GetPluralString (string singular, String defaultPlural,
int n);
+ }
+}
Modified: trunk/mono-addins/Mono.Addins/Mono.Addins.mdp
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.mdp 2007-12-05 14:57:32 UTC
(rev 90768)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.mdp 2007-12-05 15:01:29 UTC
(rev 90769)
@@ -90,6 +90,7 @@
<File name="Mono.Addins.Localization/StringResourceLocalizer.cs"
subtype="Code" buildaction="Compile" />
<File name="Mono.Addins.Localization/GettextLocalizer.cs" subtype="Code"
buildaction="Compile" />
<File name="Mono.Addins.Localization/GettextDomain.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Mono.Addins.Localization/IPluralAddinLocalizer.cs"
subtype="Code" buildaction="Compile" />
</Contents>
<References>
<ProjectReference type="Gac" localcopy="True" refto="System,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches