Merge pull request #994 from KeDevServices/master

James Moger

2016-01-16 3d10bc669a9ba263c2e5884ac3e1a7eb4c2f11b6

 src/main/java/com/gitblit/wicket/pages/UserPage.java

@@ -183,7 +183,8 @@
            new Language("Norsk", "no"),

            new Language("Język Polski", "pl"),

            new Language("Português", "pt_BR"),

            new Language("中文", "zh_CN"));

            new Language("簡體中文", "zh_CN"),

            new Language("正體中文", "zh_TW"));



      Locale locale = user.getPreferences().getLocale();

      if (locale == null) {