merge branch 'integration/master' into rhbz991336

Conflicts: zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
zanata · Nov 21, 2013 · 3c5d458 · 3c5d458
2 parents d9adad2 + 08eea55
commit 3c5d458
Show file tree

Hide file tree

Showing 4 changed files with 181 additions and 165 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java b/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
@@ -96,8 +96,7 @@ public boolean isUserInTeam() {
     }
 
     @Restrict("#{s:hasPermission(languageTeamAction.locale, 'manage-language-team')}")
-    public
-            void addSelected() {
+    public void addSelected() {
         for (SelectablePerson selectablePerson : getSearchResults()) {
             if (selectablePerson.isSelected()) {
                 addTeamMember(selectablePerson.getPerson().getId(),
@@ -145,7 +144,7 @@ public void joinTribe() {
                     authenticatedAccount.getUsername(), this.language);
             // FIXME use localizable string
             FacesMessages.instance().add(
-                    "You are now a member of the {} language team",
+                    "You are now a member of the {0} language team",
                     getLocale().retrieveNativeName());
         } catch (Exception e) {
             FacesMessages.instance().add(Severity.ERROR, e.getMessage());
@@ -164,50 +163,51 @@ public void leaveTribe() {
         Events.instance().raiseEvent("personLeftTribe");
         log.info("{} left tribe {}", authenticatedAccount.getUsername(),
                 this.language);
+        // FIXME use localizable string
         FacesMessages.instance().add("You have left the {0} language team",
                 getLocale().retrieveNativeName());
     }
 
     @Restrict("#{s:hasPermission(languageTeamAction.locale, 'manage-language-team')}")
-    public
-            void saveTeamCoordinator(HLocaleMember member) {
+    public void saveTeamCoordinator(HLocaleMember member) {
         this.localeDAO.makePersistent(getLocale());
         this.localeDAO.flush();
         if (member.isCoordinator()) {
             FacesMessages.instance().add(
                     "{0} has been made a Team Coordinator",
                     member.getPerson().getAccount().getUsername());
         } else {
+            // TODO i18n
             FacesMessages.instance().add(
-                    "{0} has been removed from as Team Coordinators",
+                    "{0} has been removed as Team Coordinator",
                     member.getPerson().getAccount().getUsername());
         }
     }
 
     @Restrict("#{s:hasPermission(languageTeamAction.locale, 'manage-language-team')}")
-    public
-            void saveTeamReviewer(HLocaleMember member) {
+    public void saveTeamReviewer(HLocaleMember member) {
         this.localeDAO.makePersistent(getLocale());
         this.localeDAO.flush();
         if (member.isReviewer()) {
             FacesMessages.instance().add("{0} has been made a Team Reviewer",
                     member.getPerson().getAccount().getUsername());
         } else {
+            // TODO i18n
             FacesMessages.instance().add(
                     "{0} has been removed from as Team Reviewer",
                     member.getPerson().getAccount().getUsername());
         }
     }
 
     @Restrict("#{s:hasPermission(languageTeamAction.locale, 'manage-language-team')}")
-    public
-            void saveTeamTranslator(HLocaleMember member) {
+    public void saveTeamTranslator(HLocaleMember member) {
         this.localeDAO.makePersistent(getLocale());
         this.localeDAO.flush();
         if (member.isReviewer()) {
             FacesMessages.instance().add("{0} has been made a Team Translator",
                     member.getPerson().getAccount().getUsername());
         } else {
+            // TODO i18n
             FacesMessages.instance().add(
                     "{0} has been removed from as Team Translator",
                     member.getPerson().getAccount().getUsername());

diff --git a/zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java b/zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
@@ -77,9 +77,8 @@ public void execute() {
                     task.getHandle().set(returnValue);
                 } catch (Exception t) {
                     task.getHandle().setException(t);
-                    AsynchronousTaskExecutor.log
-                            .debug("Exception when executing an asynchronous task.",
-                                    t);
+                    log.error(
+                        "Exception when executing an asynchronous task.", t);
                 }
             }