[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16243: Blueprint invite-message-i18n: Implemented i18n for account invite and recovery email messages.

Merge authors:
  Halvdan Hoem Grelland (halvdanhg)

revision-diff.txt (15.7 KB)

···

------------------------------------------------------------
revno: 16243 [merge]
committer: Halvdan Hoem Grelland <halvdanhg@gmail.com>
branch nick: dhis2
timestamp: Fri 2014-07-25 17:19:34 +0200
message:
  Blueprint invite-message-i18n: Implemented i18n for account invite and recovery email messages.
removed:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/invite_message1.vm
  dhis-2/dhis-services/dhis-service-core/src/main/resources/invite_message2.vm
  dhis-2/dhis-services/dhis-service-core/src/main/resources/restore_message1.vm
  dhis-2/dhis-services/dhis-service-core/src/main/resources/restore_message2.vm
added:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/invite_message1.vm
  dhis-2/dhis-services/dhis-service-core/src/main/resources/invite_message2.vm
  dhis-2/dhis-services/dhis-service-core/src/main/resources/restore_message1.vm
  dhis-2/dhis-services/dhis-service-core/src/main/resources/restore_message2.vm
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nManager.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/DefaultI18nManager.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/RestoreType.java
  dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml
  dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.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