dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7906
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-08-13 15:34:45 +0200
message:
  Added missing translations
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java	2012-07-25 13:18:48 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java	2012-08-13 13:34:45 +0000
@@ -229,9 +229,9 @@
 
     public Collection<DataElementCategoryCombo> getDataElementCategoryCombos( final Collection<Integer> identifiers )
     {
-        Collection<DataElementCategoryCombo> categoryCombo = getAllDataElementCategoryCombos();
+        Collection<DataElementCategoryCombo> categoryCombos = getAllDataElementCategoryCombos();
 
-        return identifiers == null ? categoryCombo : FilterUtils.filter( categoryCombo,
+        return identifiers == null ? categoryCombos : FilterUtils.filter( categoryCombos,
             new Filter<DataElementCategoryCombo>()
             {
                 public boolean retain( DataElementCategoryCombo object )

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java	2012-01-30 16:18:51 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java	2012-08-13 13:34:45 +0000
@@ -273,7 +273,7 @@
 
                 if ( categoryOptionCombo == null )
                 {
-                    return i18n.getString( "cate_option_combo_with_id" ) + ": " + optionComboId + " " + i18n.getString( "does_not_exist" );
+                    return i18n.getString( "category_option_combo_with_id" ) + ": " + optionComboId + " " + i18n.getString( "does_not_exist" );
                 }
 
                 if ( dataElement.getType().equals( DataElement.VALUE_TYPE_BOOL ) )

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java	2012-07-01 18:55:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java	2012-08-13 13:34:45 +0000
@@ -211,11 +211,11 @@
 
     public Collection<UserCredentials> getUsers( final Collection<Integer> identifiers, User user )
     {
-        Collection<UserCredentials> userCredentialsS = getAllUserCredentials();
-
-        FilterUtils.filter( userCredentialsS, new UserCredentialsCanUpdateFilter( user ) );
-
-        return identifiers == null ? userCredentialsS : FilterUtils.filter( userCredentialsS,
+        Collection<UserCredentials> userCredentials = getAllUserCredentials();
+
+        FilterUtils.filter( userCredentials, new UserCredentialsCanUpdateFilter( user ) );
+
+        return identifiers == null ? userCredentials : FilterUtils.filter( userCredentials,
             new Filter<UserCredentials>()
             {
                 public boolean retain( UserCredentials object )

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2012-08-12 20:22:53 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2012-08-13 13:34:45 +0000
@@ -95,3 +95,6 @@
 user_roles=User roles
 register_complete_failed_dataset_is_locked=Data set is locked, registration failed, please contact admin
 unregister_complete_failed_dataset_is_locked=Data set is locked, un-registration failed, please contact admin
+dataelement_with_id=Data element with identifier
+category_option_combo_with_id=Category option combination identifier
+does_not_exist=does not exist
\ No newline at end of file