From ddb3a3b72db48ad8426ccfbcc2617890121345b9 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Wed, 17 Jul 2013 08:00:07 +1000 Subject: [PATCH] refactor code as suggested --- .../java/org/zanata/action/ViewAllStatusAction.java | 12 ++++++------ zanata-war/src/main/resources/messages.properties | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java b/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java index 15c19461c0..0f7609d586 100644 --- a/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java @@ -219,8 +219,8 @@ public void refreshStatistic() { HProjectIteration iteration = projectIterationDAO.getBySlug(this.projectSlug, this.iterationSlug); - List locale = this.getDisplayLocales(); - String[] localeIds = getLocaleIds(locale); + List localeList = this.getDisplayLocales(); + String[] localeIds = getLocaleIds(localeList); ContainerTranslationStatistics iterationStats = statisticsServiceImpl.getStatistics(this.projectSlug, this.iterationSlug, false, true, localeIds); @@ -234,9 +234,9 @@ public void refreshStatistic() total = projectIterationDAO.getTotalCountForIteration(iteration.getId()); } - for (HLocale var : locale) + for (HLocale locale : localeList) { - TranslationStatistics stats = iterationStats.getStats(var.getLocaleId().getId(), statsOption); + TranslationStatistics stats = iterationStats.getStats(locale.getLocaleId().getId(), statsOption); if (stats == null) { stats = new TranslationStatistics(statsOption); @@ -244,9 +244,9 @@ public void refreshStatistic() // stats.setTotal(total); } - if (statsMap.containsKey(var.getLocaleId())) + if (statsMap.containsKey(locale.getLocaleId())) { - statsMap.get(var.getLocaleId()).setStats(stats); + statsMap.get(locale.getLocaleId()).setStats(stats); } } } diff --git a/zanata-war/src/main/resources/messages.properties b/zanata-war/src/main/resources/messages.properties index a84c03ce58..d73e64330c 100644 --- a/zanata-war/src/main/resources/messages.properties +++ b/zanata-war/src/main/resources/messages.properties @@ -343,7 +343,7 @@ jsf.iteration.files.translateDenied.NotLoggedIn=You are not logged In. jsf.iteration.files.translateDenied.VersionIsReadOnly=This project version is Read-Only. jsf.iteration.files.translateDenied.VersionIsObsolete=This project version is Obsolete. ! {0} is a language name -jsf.iteration.files.translateDenied.UserNotTranslatorInLanguageTeam=You are not translator of the {0} language team. +jsf.iteration.files.translateDenied.UserNotTranslatorInLanguageTeam=You are a not translator of the {0} language team. ! {0} is a list of user roles jsf.iteration.files.translateDenied.UserNotInProjectRole=You must be part of these user roles to translate this project: {0} @@ -401,7 +401,7 @@ jsf.Loading=Loading... jsf.AlreadyInTeam=Already in Team jsf.Reviewer=Reviewer jsf.Translator=Translator -jsf.RequestRoleAs=Request role in '#{sendEmail.locale.localeId.id}' language team as : +jsf.RequestRoleAs=Request the following roles in the '#{sendEmail.locale.localeId.id}' language team: #------ [home] > Help ------