The Unified and Autonomous Development Platform
wip: i18n support
Robin Shen06bad4a53c19
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.htmlindex acf9353271..dbfca3ea21 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html@@ -5,10 +5,10 @@<div class="normal-mode flex-wrap d-none d-lg-flex mr-4"><a t:data-tippy-content="Bold" class="do-bold"><wicket:svg href="bold" class="icon"></wicket:svg></a><a t:data-tippy-content="Italic" class="do-italic"><wicket:svg href="italic" class="icon"></wicket:svg></a>- <a t:data-tippy-content="md.heading" class="do-header"><wicket:svg href="header" class="icon"></wicket:svg></a>+ <a t:data-tippy-content="md:heading" class="do-header"><wicket:svg href="header" class="icon"></wicket:svg></a><span class="separator"></span><a t:data-tippy-content="Link" class="do-link"><wicket:svg href="link" class="icon"></wicket:svg></a>- <a t:data-tippy-content="md.image" class="do-image"><wicket:svg href="image" class="icon"></wicket:svg></a>+ <a t:data-tippy-content="md:image" class="do-image"><wicket:svg href="image" class="icon"></wicket:svg></a><span class="separator"></span><a t:data-tippy-content="Unordered list" class="do-list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a><a t:data-tippy-content="Ordered list" class="do-orderlist"><wicket:svg href="ordered-list" class="icon"></wicket:svg></a>@@ -69,10 +69,10 @@<wicket:fragment wicket:id="actionMenuFrag"><a class="dropdown-item do-bold"><wicket:svg href="bold" class="icon mr-1"></wicket:svg> <wicket:t>Bold</wicket:t></a><a class="dropdown-item do-italic"><wicket:svg href="italic" class="icon mr-1"></wicket:svg> <wicket:t>Italic</wicket:t></a>- <a class="dropdown-item do-header"><wicket:svg href="header" class="icon mr-1"></wicket:svg> <wicket:t>md.heading</wicket:t></a>+ <a class="dropdown-item do-header"><wicket:svg href="header" class="icon mr-1"></wicket:svg> <wicket:t>md:heading</wicket:t></a><div class="dropdown-divider"></div><a class="dropdown-item do-link"><wicket:svg href="link" class="icon mr-1"></wicket:svg> <wicket:t>Link</wicket:t></a>- <a class="dropdown-item do-image"><wicket:svg href="image" class="icon mr-1"></wicket:svg> <wicket:t>md.image</wicket:t></a>+ <a class="dropdown-item do-image"><wicket:svg href="image" class="icon mr-1"></wicket:svg> <wicket:t>md:image</wicket:t></a><div class="dropdown-divider"></div><a class="dropdown-item do-list"><wicket:svg href="unordered-list" class="icon mr-1"></wicket:svg> <wicket:t>Unordered List</wicket:t></a><a class="dropdown-item do-orderlist"><wicket:svg href="ordered-list" class="icon mr-1"></wicket:svg> <wicket:t>Ordered List</wicket:t></a>diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.javaindex 8437384aa0..3322bfb512 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.java@@ -123,25 +123,25 @@ public abstract class UserOverviewPanel extends GenericPanel<User> {translations.put("user-activities-commits-note", _T("Commits are taken from default branch of non-forked repositories"));- translations.put("week.mon", _T("week.Mon"));- translations.put("week.tue", _T("week.Tue"));- translations.put("week.wed", _T("week.Wed"));- translations.put("week.thu", _T("week.Thu"));- translations.put("week.fri", _T("week.Fri"));- translations.put("week.sat", _T("week.Sat"));- translations.put("week.sun", _T("week.Sun"));- translations.put("month.jan", _T("month.Jan"));- translations.put("month.feb", _T("month.Feb"));- translations.put("month.mar", _T("month.Mar"));- translations.put("month.apr", _T("month.Apr"));- translations.put("month.may", _T("month.May"));- translations.put("month.jun", _T("month.Jun"));- translations.put("month.jul", _T("month.Jul"));- translations.put("month.aug", _T("month.Aug"));- translations.put("month.sep", _T("month.Sep"));- translations.put("month.oct", _T("month.Oct"));- translations.put("month.nov", _T("month.Nov"));- translations.put("month.dec", _T("month.Dec"));+ translations.put("mon", _T("week:Mon"));+ translations.put("tue", _T("week:Tue"));+ translations.put("wed", _T("week:Wed"));+ translations.put("thu", _T("week:Thu"));+ translations.put("fri", _T("week:Fri"));+ translations.put("sat", _T("week:Sat"));+ translations.put("sun", _T("week:Sun"));+ translations.put("jan", _T("month:Jan"));+ translations.put("feb", _T("month:Feb"));+ translations.put("mar", _T("month:Mar"));+ translations.put("apr", _T("month:Apr"));+ translations.put("may", _T("month:May"));+ translations.put("jun", _T("month:Jun"));+ translations.put("jul", _T("month:Jul"));+ translations.put("aug", _T("month:Aug"));+ translations.put("sep", _T("month:Sep"));+ translations.put("oct", _T("month:Oct"));+ translations.put("nov", _T("month:Nov"));+ translations.put("dec", _T("month:Dec"));translations.put("activity-by-type", _T("Activity by type"));translations.put("less", _T("Less"));translations.put("more", _T("More"));diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.js b/server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.jsindex 2f10f5d2c2..f077d4b5ae 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.js+++ b/server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.js@@ -2,7 +2,7 @@ onedev.server.userOverview = {onDomReady: function(activityStatsByDay, fromDay, toDay, activityStatsByType, types, translations) {const graphContainer = $(".user-overview .daily-stats")[0];const DAY_IN_MS = 24 * 60 * 60 * 1000;- const monthNames = [translations["month.jan"], translations["month.feb"], translations["month.mar"], translations["month.apr"], translations["month.may"], translations["month.jun"], translations["month.jul"], translations["month.aug"], translations["month.sep"], translations["month.oct"], translations["month.nov"], translations["month.dec"]];+ const monthNames = [translations["jan"], translations["feb"], translations["mar"], translations["apr"], translations["may"], translations["jun"], translations["jul"], translations["aug"], translations["sep"], translations["oct"], translations["nov"], translations["dec"]];function getEpochDay(date) {// Get the date at midnight in local timezone@@ -87,7 +87,7 @@ onedev.server.userOverview = {const dayLabelsCol = document.createElement("div");dayLabelsCol.className = "calendar-day-labels";- const dayLabelTexts = [translations["week.sun"], translations["week.mon"], translations["week.tue"], translations["week.wed"], translations["week.thu"], translations["week.fri"], translations["week.sat"]];+ const dayLabelTexts = [translations["sun"], translations["mon"], translations["tue"], translations["wed"], translations["thu"], translations["fri"], translations["sat"]];const showDayLabelFor = [false, true, false, true, false, true, false]; // Show Mon, Wed, Frifor (let i = 0; i < 7; i++) {diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation.javaindex 6af285fcd4..6128dd2a8d 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation.java@@ -71,28 +71,45 @@ public class Translation extends TranslationResourceBundle {private static void init() {m.clear();- m.put("md.heading", "Heading");- m.put("md.image", "Image");+ m.put("md:heading", "Heading");+ m.put("md:image", "Image");m.put("container-image", "Image");- m.put("month.Apr", "Apr");- m.put("month.Aug", "Aug");- m.put("month.Dec", "Dec");- m.put("month.Feb", "Feb");- m.put("month.Jan", "Jan");- m.put("month.Jul", "Jul");- m.put("month.Jun", "Jun");- m.put("month.Mar", "Mar");- m.put("month.May", "May");- m.put("month.Nov", "Nov");- m.put("month.Oct", "Oct");- m.put("month.Sep", "Sep");- m.put("week.Fri", "Fri");- m.put("week.Mon", "Mon");- m.put("week.Sat", "Sat");- m.put("week.Sun", "Sun");- m.put("week.Thu", "Thu");- m.put("week.Tue", "Tue");- m.put("week.Wed", "Wed");+ m.put("month:Apr", "Apr");+ m.put("month:Aug", "Aug");+ m.put("month:Dec", "Dec");+ m.put("month:Feb", "Feb");+ m.put("month:Jan", "Jan");+ m.put("month:Jul", "Jul");+ m.put("month:Jun", "Jun");+ m.put("month:Mar", "Mar");+ m.put("month:May", "May");+ m.put("month:Nov", "Nov");+ m.put("month:Oct", "Oct");+ m.put("month:Sep", "Sep");+ m.put("week:Fri", "Fri");+ m.put("week:Mon", "Mon");+ m.put("week:Sat", "Sat");+ m.put("week:Sun", "Sun");+ m.put("week:Thu", "Thu");+ m.put("week:Tue", "Tue");+ m.put("week:Wed", "Wed");+ m.put("action:changed merge strategy", "changed merge strategy");+ m.put("action:changed title", "changed title");+ m.put("action:enabled auto merge", "enabled auto merge");+ m.put("action:disabled auto merge", "disabled auto merge");+ m.put("action:removed comment", "removed comment");+ m.put("action:approved", "approved");+ m.put("action:discarded", "discarded");+ m.put("action:merged", "merged");+ m.put("action:referenced from code comment", "referenced from code comment");+ m.put("action:referenced from issue", "referenced from issue");+ m.put("action:referenced from other pull request", "referenced from other pull request");+ m.put("action:reopened", "reopened");+ m.put("action:requested for changes", "requested for changes");+ m.put("action:deleted source branch", "deleted source branch");+ m.put("action:restored source branch", "restored source branch");+ m.put("action:changed target branch", "changed target branch");+ m.put("action:commented", "commented");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.javaindex b6e2ca959c..cc5494942f 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java@@ -30,6 +30,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {"<a wicket:id=\"user\" class=\"link-gray\"></a> 于 <span wicket:id=\"date\"></span><span wicket:id=\"activity\"></span>");m.put("<a wicket:id=\"verifyRecoveryCode\">Verify by recovery code</a> if you can not access your TOTP authenticator","<a wicket:id=\"verifyRecoveryCode\">通过恢复代码验证</a>(如果您无法访问 TOTP 认证器)");+ m.put("<b class='text-danger'>NOTE: </b> This requires an enterprise subscription. <a href='https://onedev.io/pricing' target='_blank'>Try free</a> for 30 days",+ "<b class='text-danger'>注意:</b> 这需要企业订阅。<a href='https://onedev.io/pricing' target='_blank'>免费试用</a> 30 天");m.put("<b class='text-danger'>NOTE: </b> This step requires an enterprise subscription. <a href='https://onedev.io/pricing' target='_blank'>Try free</a> for 30 days","<b class='text-danger'>注意:</b> 此步骤需要企业版订阅。<a href='https://onedev.io/pricing' target='_blank'>免费试用 30 天</a>");m.put("<b class='text-warning'>NOTE: </b><a href='https://docs.onedev.io/tutorials/issue/time-tracking' target='_blank'>Time tracking</a> is an enterprise feature. <a href='https://onedev.io/pricing' target='_blank'>Try free</a> for 30 days",@@ -1043,6 +1045,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Hide comment", "隐藏注释");m.put("Hide saved queries", "隐藏保存的查询");m.put("High", "高");+ m.put("High Availability & Scalability", "高可用和可扩展");m.put("History", "历史");m.put("History of comparing revisions is unrelated", "比较的版本历史不相关");m.put("History of target branch and source branch is unrelated", "目标分支和源分支的历史记录不相关");@@ -2298,6 +2301,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Set as Public", "设为公开");m.put("Set reviewed", "设置为已审阅");m.put("Set unreviewed", "设置为未审阅");+ m.put("Set up Microsoft Teams notification settings. Settings will be inherited by child projects, and can be overridden by defining settings with same webhook url. ",+ "设置 Microsoft Teams 通知设置。设置将继承给子项目,并可以通过定义具有相同 webhook url 的设置来覆盖。");m.put("Set up discord notification settings. Settings will be inherited by child projects, and can be overridden by defining settings with same webhook url","设置 Discord 通知设置。设置将继承给子项目,并可以通过定义具有相同 Webhook URL 的设置来覆盖");m.put("Set up job cache to speed up job execution. Check <a href='https://docs.onedev.io/tutorials/cicd/job-cache' target='_blank'>this tutorial</a> on how to use job cache",@@ -2308,6 +2313,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {"设置 Slack 通知设置。设置将继承给子项目,并可以通过定义具有相同 Webhook URL 的设置来覆盖");m.put("Set up two-factor authentication", "设置两阶段验证");m.put("Setting", "设置");+ m.put("Setting has been saved", "设置已保存");m.put("Settings", "设置");m.put("Settings and permissions of parent project will be inherited by this project", "父项目的设置和权限将继承给此项目");m.put("Share dashboard", "共享仪表板");@@ -2747,6 +2753,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Subject", "主题");m.put("Submitter", "提交者");m.put("Subscription Key", "订阅密钥");+ m.put("Subscription Management", "订阅管理");m.put("Subscription data", "订阅数据");m.put("Successful", "成功");m.put("Suffix Pattern", "后缀模式");@@ -2964,6 +2971,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Undefined State Resolution", "未定义状态解析");m.put("Under which condition this step should run. <b>Successful</b> means all non-optional steps running before this step are successful","在什么条件下应运行此步骤。<b>成功</b>表示在此步骤之前运行的所有非可选步骤都已成功");+ m.put("Unexpected setting: {0}", "未知设置:{0}");m.put("Unified", "统一");m.put("Unlimited", "无限制");m.put("Unlink this issue", "取消链接此工单");@@ -3216,22 +3224,22 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("log", "日志");m.put("manage job", "管理任务");m.put("may not be empty", "不能为空");- m.put("md.heading", "标题");- m.put("md.image", "图片");+ m.put("md:heading", "标题");+ m.put("md:image", "图片");m.put("merge preview updated", "合并预览更新");m.put("merged", "已合并");- m.put("month.Apr", "四月");- m.put("month.Aug", "八月");- m.put("month.Dec", "十二月");- m.put("month.Feb", "二月");- m.put("month.Jan", "一月");- m.put("month.Jul", "七月");- m.put("month.Jun", "六月");- m.put("month.Mar", "三月");- m.put("month.May", "五月");- m.put("month.Nov", "十一月");- m.put("month.Oct", "十月");- m.put("month.Sep", "九月");+ m.put("month:Apr", "四月");+ m.put("month:Aug", "八月");+ m.put("month:Dec", "十二月");+ m.put("month:Feb", "二月");+ m.put("month:Jan", "一月");+ m.put("month:Jul", "七月");+ m.put("month:Jun", "六月");+ m.put("month:Mar", "三月");+ m.put("month:May", "五月");+ m.put("month:Nov", "十一月");+ m.put("month:Oct", "十月");+ m.put("month:Sep", "九月");m.put("new field", "新字段");m.put("on file {0}", "在文件 {0} 上");m.put("opened", "已创建");@@ -3261,13 +3269,13 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("unassigned from \"{0}\"", "取消分配给 \"{0}\"");m.put("unresolved code comment", "将代码评论标记为未解决");m.put("w%02d", "第 %d 周");- m.put("week.Fri", "周五");- m.put("week.Mon", "周一");- m.put("week.Sat", "周六");- m.put("week.Sun", "周日");- m.put("week.Thu", "周四");- m.put("week.Tue", "周二");- m.put("week.Wed", "周三");+ m.put("week:Fri", "周五");+ m.put("week:Mon", "周一");+ m.put("week:Sat", "周六");+ m.put("week:Sun", "周日");+ m.put("week:Thu", "周四");+ m.put("week:Tue", "周二");+ m.put("week:Wed", "周三");m.put("{0} Month(s)", "{0} 个月");m.put("{0} activities on {1}", "{1} 有 {0} 个活动");m.put("{0} additions & {1} deletions", "{0} 个添加,{1} 个删除");@@ -3289,14 +3297,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "不能为空");m.put("{javax.validation.constraints.NotNull.message}", "不能为空");m.put("{javax.validation.constraints.Size.message}", "至少需要指定一个值");- m.put("<b class='text-danger'>NOTE: </b> This requires an enterprise subscription. <a href='https://onedev.io/pricing' target='_blank'>Try free</a> for 30 days",- "<b class='text-danger'>注意:</b> 这需要企业订阅。<a href='https://onedev.io/pricing' target='_blank'>免费试用</a> 30 天");- m.put("High Availability & Scalability", "高可用和可扩展");- m.put("Set up Microsoft Teams notification settings. Settings will be inherited by child projects, and can be overridden by defining settings with same webhook url. ",- "设置 Microsoft Teams 通知设置。设置将继承给子项目,并可以通过定义具有相同 webhook url 的设置来覆盖。");- m.put("Setting has been saved", "设置已保存");- m.put("Subscription Management", "订阅管理");- m.put("Unexpected setting: {0}", "未知设置:{0}");+ m.put("Timesheets", "时间表");// Manually added keysm.put("Create Administrator Account", "创建管理员账户");diff --git a/server-ee b/server-eeindex 9dcb407057..4818db76d0 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 9dcb4070576a70f811ff54aba623df277ad81272+Subproject commit 4818db76d099f68c3da537f2bb4ba4c344c6430a