SEAMINTL-34 BundleTemplateMessage should use @client Locale

seam · Mar 23, 2011 · c4affd2 · c4affd2
1 parent 0bb11cd
commit c4affd2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.../src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java b/.../src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java
@@ -16,12 +16,15 @@
  */
 package org.jboss.seam.international.status.builder;
 
+import java.util.Locale;
+
 import javax.inject.Inject;
 
 import org.jboss.logging.Logger;
 import org.jboss.seam.international.status.ApplicationBundles;
 import org.jboss.seam.international.status.Level;
 import org.jboss.seam.international.status.Message;
+import org.jboss.seam.solder.core.Client;
 
 /**
  * 
@@ -38,12 +41,16 @@ public class BundleTemplateMessageImpl implements BundleTemplateMessage {
     @Inject
     ApplicationBundles bundles;
 
+    @Inject
+    @Client
+    Locale clientLocale;
+
     private final Logger log = Logger.getLogger(BundleTemplateMessageImpl.class);
 
     public Message build() {
         String text;
         try {
-            text = bundles.get(textKey.getBundle()).getString(textKey.getKey());
+            text = bundles.get(clientLocale, textKey.getBundle()).getString(textKey.getKey());
         } catch (Exception e) {
             log.warn("Could not load bundle: " + textKey);
             text = textDefault;

diff --git a/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java b/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java
@@ -25,6 +25,7 @@
 import org.jboss.arquillian.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.international.locale.DefaultLocaleProducer;
+import org.jboss.seam.international.locale.UserLocaleProducer;
 import org.jboss.seam.international.status.ApplicationBundles;
 import org.jboss.seam.international.status.Level;
 import org.jboss.seam.international.status.MessageFactory;
@@ -55,7 +56,8 @@ public static JavaArchive createTestArchive() {
         return ShrinkWrap
                 .create(JavaArchive.class, "test.jar")
                 .addClasses(MessagesImpl.class, MessageFactory.class, BundleTemplateMessageImpl.class,
-                        TemplateMessageImpl.class, ApplicationBundles.class, DefaultLocaleProducer.class)
+                        TemplateMessageImpl.class, ApplicationBundles.class, DefaultLocaleProducer.class,
+                        UserLocaleProducer.class)
                 .addManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
     }
 

diff --git a/.../java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java b/.../java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java
@@ -23,6 +23,7 @@
 import org.jboss.arquillian.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.international.locale.DefaultLocaleProducer;
+import org.jboss.seam.international.locale.UserLocaleProducer;
 import org.jboss.seam.international.status.ApplicationBundles;
 import org.jboss.seam.international.status.MessageFactory;
 import org.jboss.seam.international.status.builder.BundleTemplateMessageImpl;
@@ -47,7 +48,7 @@ public static Archive<?> createTestArchive() {
         return ShrinkWrap
                 .create(JavaArchive.class, "test.jar")
                 .addClasses(MessageFactory.class, BundleTemplateMessageImpl.class, TemplateMessageImpl.class,
-                        ApplicationBundles.class, DefaultLocaleProducer.class)
+                        ApplicationBundles.class, DefaultLocaleProducer.class, UserLocaleProducer.class)
                 .addManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
     }