Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 15:35:49 +01:00
Code Issues Packages Projects Releases Activity

improve i18n support

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-03-31 10:52:25 +02:00
parent ca7c59aea5
commit 9739b216c4
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java
View File

@@ -117,15 +117,15 @@ public class TemplateServlet extends HttpServlet
params.put("locale", locale); params.put("locale", locale);
String shortLocale = locale; String country = locale;
int i = shortLocale.indexOf("_"); int i = country.indexOf("_");
if (i > 0) if (i > 0)
{ {
shortLocale = shortLocale.substring(0, i); country = country.substring(0, i);
} }
params.put("shortLocale", shortLocale); params.put("country", country);
String templateName = getTemplateName(contextPath, request.getRequestURI()); String templateName = getTemplateName(contextPath, request.getRequestURI());
Writer writer = null; Writer writer = null;

13
scm-webapp/src/main/webapp/index.html
View File

@@ -43,6 +43,13 @@
<link rel="icon" type="image/png" href="resources/images/favicon.png" /> <link rel="icon" type="image/png" href="resources/images/favicon.png" />
--> -->
<script type="text/javascript">
var i18n = {
locale: '${locale}',
country: '${country}'
};
</script>
<link rel="stylesheet" type="text/css" href="resources/extjs/resources/css/ext-all.css" /> <link rel="stylesheet" type="text/css" href="resources/extjs/resources/css/ext-all.css" />
<link rel="stylesheet" type="text/css" href="resources/extjs/resources/css/xtheme-gray.css" /> <link rel="stylesheet" type="text/css" href="resources/extjs/resources/css/xtheme-gray.css" />
<link rel="stylesheet" type="text/css" href="resources/css/style.css" /> <link rel="stylesheet" type="text/css" href="resources/css/style.css" />
@@ -64,9 +71,9 @@
<script type="text/javascript" src="resources/js/sonia.plugin.js"></script> <script type="text/javascript" src="resources/js/sonia.plugin.js"></script>
<script type="text/javascript" src="resources/js/sonia.scm.js"></script> <script type="text/javascript" src="resources/js/sonia.scm.js"></script>
<script type="text/javascript" src="plugins/sonia.plugin.js"></script> <script type="text/javascript" src="plugins/sonia.plugin.js"></script>
<#if shortLocale != 'en'> <#if country != 'en'>
<script type="text/javascript" src="resources/extjs/i18n/ext-lang-${shortLocale}.js"></script> <script type="text/javascript" src="resources/extjs/i18n/ext-lang-${country}.js"></script>
<script type="text/javascript" src="resources/js/i18n/${shortLocale}.js"></script> <script type="text/javascript" src="resources/js/i18n/${country}.js"></script>
</#if> </#if>
<title>SCM-WebAPP</title> <title>SCM-WebAPP</title>