Merge branch 'master' of repo.wisemapping.org:wisemapping/wiseorg

2012-08-22 00:43:00 -03:00
parent 448c9e55e7 db6a9d90b4
commit 9aba9993e2
2 changed files with 33 additions and 0 deletions
--- a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
+++ b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
@@ -57,6 +57,9 @@
                        <option value="es" <c:if test="${user.locale=='es'}">selected="selected" </c:if>>Spanish -
                            español
                        </option>
+                        <option value="fr" <c:if test="${user.locale=='fr'}">selected="selected" </c:if>>French -
+                            français
+                        </option>
                        <option value="zh_cn" <c:if test="${user.locale=='zh_cn'}">selected="selected" </c:if>>Chinese
                            (Simplified Han) - 中文（简体中文）
                        </option>