From 0de7e5e56b11a05997e38f79413c4411f906311f Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <sop@google.com>
Date: Fri, 16 Jan 2009 10:44:24 -0800
Subject: [PATCH] Fix plural counts by selecting en_US as the default locale

We only have translations for the messages in English, but to
make the @PluralCount code kick in right for even that language
we must set our local to some form of English and provide some
translation files for that language.

Signed-off-by: Shawn O. Pearce <sop@google.com>
---
 appjar/src/main/java/com/google/gerrit/Gerrit.gwt.xml        | 4 +---
 .../google/gerrit/client/changes/ChangeMessages.properties   | 3 ---
 .../gerrit/client/changes/ChangeMessages_en.properties       | 5 +++++
 .../google/gerrit/client/patches/PatchMessages.properties    | 1 -
 .../google/gerrit/client/patches/PatchMessages_en.properties | 2 ++
 appjar/src/main/java/com/google/gerrit/public/Gerrit.html    | 1 +
 6 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages_en.properties
 create mode 100644 appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages_en.properties

diff --git a/appjar/src/main/java/com/google/gerrit/Gerrit.gwt.xml b/appjar/src/main/java/com/google/gerrit/Gerrit.gwt.xml
index ee981df410..2d64ac551b 100644
--- a/appjar/src/main/java/com/google/gerrit/Gerrit.gwt.xml
+++ b/appjar/src/main/java/com/google/gerrit/Gerrit.gwt.xml
@@ -3,10 +3,8 @@
   <inherits name='com.google.gwt.i18n.I18N'/>
   <inherits name='com.google.gwtjsonrpc.GWTJSONRPC'/>
   <inherits name='com.google.gwtorm.GWTORM'/>
-
   <inherits name='com.google.gwt.user.theme.chrome.Chrome'/>
-  <!-- <inherits name='com.google.gwt.user.theme.standard.Standard'/> -->
-  <!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/>     -->
+  <extend-property name="locale" values="en"/>
 
   <!-- openid.AllowFrameImpl -->
 	  <replace-with class="com.google.gerrit.client.openid.AllowFrameImpl">
diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties
index bf63415496..39d8c0eb0a 100644
--- a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties
+++ b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties
@@ -7,10 +7,7 @@ patchSetHeader = Patch Set {0}
 patchSetAction = {0} Patch Set {1}
 repoDownload = repo download {0} {1}/{2}
 
-patchTableComments[one] = 1 comment
 patchTableComments = {0} comments
-
-patchTableDrafts[one] = 1 draft
 patchTableDrafts = {0} drafts
 
 messageWrittenOn = on {0}
diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages_en.properties b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages_en.properties
new file mode 100644
index 0000000000..a5e9426b6d
--- /dev/null
+++ b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages_en.properties
@@ -0,0 +1,5 @@
+patchTableComments[one] = 1 comment
+patchTableComments = {0} comments
+
+patchTableDrafts[one] = 1 draft
+patchTableDrafts = {0} drafts
diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties b/appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties
index 670e77db34..e07d0558b3 100644
--- a/appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties
+++ b/appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties
@@ -1,6 +1,5 @@
 patchHeaderAncestor = Ancestor {0}
 
-patchSkipRegion[one] = (... skipping 1 common line ...)
 patchSkipRegion = (...skipping {0} common lines ...)
 
 draftSaved = Draft saved at {0,time,short}
diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages_en.properties b/appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages_en.properties
new file mode 100644
index 0000000000..867dc85ce6
--- /dev/null
+++ b/appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages_en.properties
@@ -0,0 +1,2 @@
+patchSkipRegion[one] = (... skipping 1 common line ...)
+patchSkipRegion = (...skipping {0} common lines ...)
diff --git a/appjar/src/main/java/com/google/gerrit/public/Gerrit.html b/appjar/src/main/java/com/google/gerrit/public/Gerrit.html
index dcd7bbd026..2321a9d3f6 100644
--- a/appjar/src/main/java/com/google/gerrit/public/Gerrit.html
+++ b/appjar/src/main/java/com/google/gerrit/public/Gerrit.html
@@ -1,6 +1,7 @@
 <html>
   <head>
     <title>Gerrit Code Review</title>
+    <meta name="gwt:property" content="locale=en_US" />
     <script id="gerrit_gerritconfig"></script>
     <script type="text/javascript" language="javascript" src="com.google.gerrit.Gerrit.nocache.js"></script>
     <style type="text/css" id="gerrit_sitecss"></style>