=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml 2015-01-22 16:55:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml 2015-02-23 11:48:32 +0000
@@ -46,6 +46,7 @@
index.html
+
dhis-web-event-capture
i18n
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/appcache/CacheManifestAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/appcache/CacheManifestAction.java 2015-02-22 20:30:29 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/appcache/CacheManifestAction.java 2015-02-23 11:48:32 +0000
@@ -38,9 +38,9 @@
import javax.servlet.ServletContext;
import org.apache.struts2.ServletActionContext;
+import org.hisp.dhis.i18n.locale.LocaleManager;
import org.hisp.dhis.system.SystemInfo;
import org.hisp.dhis.system.SystemService;
-import org.hisp.dhis.user.UserSettingService;
import org.springframework.beans.factory.annotation.Autowired;
import com.opensymphony.xwork2.Action;
@@ -53,10 +53,10 @@
implements Action
{
@Autowired
- private UserSettingService userSettingService;
-
- @Autowired
private SystemService systemService;
+
+ @Autowired
+ private LocaleManager localeManager;
private String appPath;
@@ -97,7 +97,8 @@
File i18nFolder = null;
StringBuffer stringBuffer = null;
- String locale = userSettingService.getUserSetting( UserSettingService.KEY_UI_LOCALE ).toString();
+ String locale = localeManager.getCurrentLocale().toString();
+
SystemInfo info = systemService.getSystemInfo();
String revisionTag = "#Revision:" + info.getRevision();