From a9ea4e7cab244f2a6527b9ea5bef4aefa4e486cf Mon Sep 17 00:00:00 2001
From: Khwunchai J <khwunchai.j@ku.th>
Date: Fri, 17 Jun 2016 13:01:57 +0700
Subject: [PATCH] [FIX] web_settings_dashboard: Incorrected plural form of
 "Active Users"

Odoo add the extra letter "s" to the translated word "Active User".
This is caused by adding "s" at the end of the word directly from the template,
which makes no sense in many language.
This prohibits translators from translating the plural form in any language.
The plural form and singular form of "Active User" should be translate
separately.

Fixes #12469
Closes #12470
---
 .../i18n/web_settings_dashboard.pot               | 15 +++++++++++----
 .../static/src/xml/dashboard.xml                  |  4 +++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot b/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
index 6ddf7cee78b..c9a10eb48d7 100644
--- a/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
+++ b/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 9.0c\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-28 12:13+0000\n"
-"PO-Revision-Date: 2016-01-28 12:13+0000\n"
+"POT-Creation-Date: 2016-06-17 08:01+0000\n"
+"PO-Revision-Date: 2016-06-17 08:01+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -25,14 +25,21 @@ msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:49
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:56
 #, python-format
 msgid "Active User"
 msgstr ""
 
 #. module: web_settings_dashboard
 #. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:9
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:57
+#, python-format
+msgid "Active Users"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:42
 #, python-format
 msgid "App store"
 msgstr ""
diff --git a/addons/web_settings_dashboard/static/src/xml/dashboard.xml b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
index 5f9f9eee309..796629860d7 100644
--- a/addons/web_settings_dashboard/static/src/xml/dashboard.xml
+++ b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
@@ -52,7 +52,9 @@
                 <t t-set="active_users" t-value="widget.data.active_users"></t>
                 <t t-set="pending_users" t-value="widget.data.pending_users"></t>
                 <t t-if="active_users">
-                    <t t-esc="active_users"></t> Active User<t t-if="active_users > 1">s</t>
+                    <t t-esc="active_users"></t>
+                    <t t-if="active_users &lt;= 1"> Active User</t>
+                    <t t-if="active_users &gt; 1">Active Users</t>
                 </t>
             </div>
             <div class="text-center">