Fix several I18n isssues.

2012-07-06 00:46:54 -03:00
parent aedab95b4a
commit b816d12842
15 changed files with 111 additions and 173 deletions
--- a/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java
+++ b/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java
@@ -44,7 +44,7 @@ public class UserLocaleInterceptor extends HandlerInterceptorAdapter {
        if (user != null && session != null) {
            String userLocale = user.getLocale();
            final Locale sessionLocale = (Locale) session.getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
-            if ((userLocale != null) && ((sessionLocale == null) || (!userLocale.equals(sessionLocale.getISO3Language())))) {
+            if ((userLocale != null) && ((sessionLocale == null) || (!userLocale.equals(sessionLocale.toString())))) {
                session.setAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME, new Locale(userLocale));
            }
        }
--- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java
@@ -70,6 +70,8 @@ public class MindmapController {
        final MindMapBean mindmap = findMindmapBean(id);
        model.addAttribute("principal", Utils.getUser());
        model.addAttribute("mindmap", mindmap);
+        final Locale locale = LocaleContextHolder.getLocale();
+        model.addAttribute("locale", locale.toString().toLowerCase());
        return "mindmapPrint";
    }

@@ -128,7 +130,7 @@ public class MindmapController {
    @RequestMapping(value = "maps/")
    public String showListPage(@NotNull Model model) {
        final Locale locale = LocaleContextHolder.getLocale();
-        model.addAttribute("locale", locale.getISO3Language());
+        model.addAttribute("locale", locale.toString().toLowerCase());
        return "mindmapList";
    }

@@ -143,7 +145,7 @@ public class MindmapController {

            // Configure default locale for the editor ...
            final Locale locale = LocaleContextHolder.getLocale();
-            model.addAttribute("locale", locale.getISO3Language());
+            model.addAttribute("locale", locale.toString().toLowerCase());
            model.addAttribute("principal", Utils.getUser());
            result = "mindmapEditor";
        } else {
@@ -178,6 +180,8 @@ public class MindmapController {
        final MindMapBean mindmap = findMindmapBean(id);
        view = new ModelAndView("mindmapEmbedded", "mindmap", mindmap);
        view.addObject("zoom", zoom == null ? 1 : zoom);
+        final Locale locale = LocaleContextHolder.getLocale();
+        view.addObject("locale", locale.toString().toLowerCase());
        return view;
    }

--- a/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
@@ -86,8 +86,6 @@ public class AccountController extends BaseController {
        if (language == null) {
            throw new IllegalArgumentException("language can not be null");

-        } if (!language.equals("en") && !language.equals("es") ){
-            throw new IllegalArgumentException("language not supported yet");
        }

        final User user = Utils.getUser();
--- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties
@@ -1,4 +1,4 @@
-# First line error ...
+# Default English Support.

 NAME=Name
 DESCRIPTION=Description
@@ -200,7 +200,7 @@ UNDO_EDITION=Undo Edition
 REDO_EDITION=Redo Edition
 SELECT_ALL_TOPIC=Select All Topic
 CHANGE_TEXT_BOLD=Change Text Bold Type
-SAVE_CHANGES=Save Chages
+SAVE_CHANGES=Save Changes
 CHANGE_TEXT_ITALIC=Change Text Italic
 DESELECT_ALL_TOPIC=Deselect All Topic
 SHORTCUTS=Shortcuts
--- a/wise-webapp/src/main/webapp/css/pageHeaders.css
+++ b/wise-webapp/src/main/webapp/css/pageHeaders.css
@@ -108,6 +108,7 @@ div#headerButtons activelink a, div#headerButtons activelink a:hover {
    font-size: 90%;
    background-color: white;
    float: left;
+    padding-top:5px;
 }

 div#paypal {
--- a/wise-webapp/src/main/webapp/js/jquery.timeago.zh_cn.js
+++ b/wise-webapp/src/main/webapp/js/jquery.timeago.zh_cn.js
@@ -0,0 +1,20 @@
+// Simplified Chinese
+jQuery.timeago.settings.strings = {
+  prefixAgo: null,
+  prefixFromNow: "从现在开始",
+  suffixAgo: "之前",
+  suffixFromNow: null,
+  seconds: "不到 1 分钟",
+  minute: "大约 1 分钟",
+  minutes: "%d 分钟",
+  hour: "大约 1 小时",
+  hours: "大约 %d 小时",
+  day: "1 天",
+  days: "%d 天",
+  month: "大约 1 个月",
+  months: "%d 月",
+  year: "大约 1 年",
+  years: "%d 年",
+  numbers: [],
+  wordSeparator: ""
+};
--- a/wise-webapp/src/main/webapp/js/jquery.timeago.zh_tw.js
+++ b/wise-webapp/src/main/webapp/js/jquery.timeago.zh_tw.js
@@ -0,0 +1,20 @@
+// Traditional Chinese, zh-tw
+jQuery.timeago.settings.strings = {
+  prefixAgo: null,
+  prefixFromNow: "從現在開始",
+  suffixAgo: "之前",
+  suffixFromNow: null,
+  seconds: "不到 1 分鐘",
+  minute: "大約 1 分鐘",
+  minutes: "%d 分鐘",
+  hour: "大約 1 小時",
+  hours: "大約 %d 小時",
+  day: "1 天",
+  days: "%d 天",
+  month: "大約 1 個月",
+  months: "%d 月",
+  year: "大約 1 年",
+  years: "%d 年",
+  numbers: [],
+  wordSeparator: ""
+};
--- a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
+++ b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
@@ -28,7 +28,7 @@
                    <label for="lastname"><strong><spring:message code="LASTNAME"/>:</strong></label>
                    <input type="text" name="lastname" id="lastname" required="required" value="${user.lastname}"/>
                    <br/>
-                    <input type="submit" id="changeUserInfoBtn" class="btn btn-primary" value="Save"/>
+                    <input type="submit" id="changeUserInfoBtn" class="btn btn-primary" value="<spring:message code="SAVE_CHANGES"/>"/>
                </fieldset>
            </form>

@@ -60,10 +60,10 @@
                        <option value="es" <c:if test="${user.locale=='es'}">selected="selected" </c:if>>Spanish -
                            español
                        </option>
-                        <option value="zh_cn" <c:if test="${user.locale=='es'}">selected="selected" </c:if>>Chinese
+                        <option value="zh_cn" <c:if test="${user.locale=='zh_cn'}">selected="selected" </c:if>>Chinese
                            (Simplified Han) - 中文（简体中文）
                        </option>
-                        <option value="zh-tw" <c:if test="${user.locale=='es'}">selected="selected" </c:if>>Chinese
+                        <option value="zh_tw" <c:if test="${user.locale=='zh_tw'}">selected="selected" </c:if>>Chinese
                            (Traditional Han) - 中文 (繁體中文)
                        </option>
                    </select>
--- a/wise-webapp/src/main/webapp/jsp/footer.jsp
+++ b/wise-webapp/src/main/webapp/jsp/footer.jsp
@@ -2,11 +2,33 @@
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>

 <div id="footer">
-    <div style="width:30%; float:left;">&nbsp;</div>
+    <div style="width:30%; float:left;">&nbsp;
+        <a href="https://twitter.com/share" class="twitter-share-button" data-via="wisemapping" data-related="wisemapping">Tweet</a>
+        <script>!function (d, s, id) {
+            var js, fjs = d.getElementsByTagName(s)[0];
+            if (!d.getElementById(id)) {
+                js = d.createElement(s);
+                js.id = id;
+                js.src = "//platform.twitter.com/widgets.js";
+                fjs.parentNode.insertBefore(js, fjs);
+            }
+        }(document, "script", "twitter-wjs");</script>
+
+        <!-- Place this tag in your head or just before your close body tag -->
+        <script type="text/javascript" src="https://apis.google.com/js/plusone.js">
+            {parsetags: 'explicit'}
+        </script>
+
+        <!-- Place this tag where you want the +1 button to render -->
+        <g:plusone></g:plusone>
+
+        <!-- Place this render call where appropriate -->
+        <script type="text/javascript">gapi.plusone.go();</script>
+    </div>
    <div style="float:left; width:40%;">
        <p><a href="http://www.wisemapping.org"><spring:message code="COPYRIGHT"/></a></p>
    </div>
-    <div style="float:left; text-align:left;padding:5px;">
+    <div style="float:left; text-align:left;">
        <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
            <input type="hidden" name="cmd" value="_s-xclick"/>
            <input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" name="submit"
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -49,8 +49,7 @@
            var parser = new DOMParser();
            var domDocument = parser.parseFromString(mapXml, "text/xml");

-            var persistence = mindplot.PersistenceManager.getInstance();
-            var mindmap = persistence.loadFromDom(mapId, domDocument);
+            var mindmap = mindplot.PersistenceManager.loadFromDom(mapId, domDocument);
            designer.loadMap(mindmap);
        });
    </script>
--- a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
@@ -33,8 +33,9 @@
            // Configure designer options ...
            var options = loadDesignerOptions();
            options.size.height = options.size.height + 50;
+            options.locale = '${locale}';
+

-            options.persistenceManager = new mindplot.RESTPersistenceManager("service/maps/");
            var userOptions = ${mindmap.properties};
            options.zoom = ${zoom};

@@ -51,8 +52,7 @@
            var parser = new DOMParser();
            var domDocument = parser.parseFromString(mapXml, "text/xml");

-            var persistence = mindplot.PersistenceManager.getInstance();
-            var mindmap = persistence.loadFromDom(mapId, domDocument);
+            var mindmap = mindplot.PersistenceManager.loadFromDom(mapId, domDocument);
            designer.loadMap(mindmap);

            $('zoomIn').addEvent('click', function () {
--- a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
@@ -47,9 +47,6 @@
            bottom: -30px;
        }

-        div#infoPanel {
-            display: none;
-        }
    </style>

    <script type='text/javascript' src='js/mootools-core.js'></script>
@@ -64,13 +61,14 @@
    <script type="text/javascript">
        var mapId = '${mindmap.id}';
        var mapXml = '${mindmap.xmlAsJsLiteral}';
-        $(document).addEvent('loadcomplete', function(resource) {
+
+        $(document).addEvent('loadcomplete', function (resource) {

            // Configure designer options ...
            var options = loadDesignerOptions();
+            options.locale = '${locale}';
            options.size.height = options.size.height + 50;

-            options.persistenceManager = new mindplot.RESTPersistenceManager("service/maps/");
            var userOptions = ${mindmap.properties};
            options.zoom = userOptions.zoom;

@@ -87,15 +85,14 @@
            var parser = new DOMParser();
            var domDocument = parser.parseFromString(mapXml, "text/xml");

-            var persistence = mindplot.PersistenceManager.getInstance();
-            var mindmap = persistence.loadFromDom(mapId, domDocument);
+            var mindmap = mindplot.PersistenceManager.loadFromDom(mapId, domDocument);
            designer.loadMap(mindmap);

-            $('zoomIn').addEvent('click', function() {
+            $('zoomIn').addEvent('click', function () {
                designer.zoomIn();
            });

-            $('zoomOut').addEvent('click', function() {
+            $('zoomOut').addEvent('click', function () {
                designer.zoomOut();
            });
        });
@@ -104,9 +101,6 @@
 <body>

 <div id="mapContainer">
-    <%--<div id="infoPanel">--%>
-    <%--<div id="dragImageNode" style="cursor: move">--%>
-    <%--</div>--%>
    <div id="mindplot"></div>
    <div id="printLogo"></div>