The Unified and Autonomous Development Platform
wip: i18n support
Robin Shencaff76074bfd
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/ExtractTranslationKeys.java b/server-core/src/main/java/io/onedev/server/commandhandler/ExtractTranslationKeys.javaindex e5f9901a34..754ada77f0 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/ExtractTranslationKeys.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/ExtractTranslationKeys.java@@ -24,6 +24,7 @@ import javax.validation.constraints.Size;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import org.unbescape.html.HtmlEscape;import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.StringUtils;@@ -41,18 +42,26 @@ public class ExtractTranslationKeys extends CommandHandler {public static final String COMMAND = "extract-translation-keys";- private static final Pattern _T_PATTERN = Pattern.compile("_T\\s*\\(\\s*\"((?:[^\"\\\\]|\\\\.)*)\"(?:\\s*\\+\\s*\"((?:[^\"\\\\]|\\\\.)*)\")*\\s*\\)");+ private static final Pattern METHOD_PATTERN = Pattern+ .compile("_T\\s*\\(\\s*\"((?:[^\"\\\\]|\\\\.)*)\"(?:\\s*\\+\\s*\"((?:[^\"\\\\]|\\\\.)*)\")*\\s*\\)");- private static final Pattern WICKET_T_PATTERN = Pattern.compile("<wicket:t>(.+?)</wicket:t>", Pattern.DOTALL|Pattern.CASE_INSENSITIVE);+ private static final Pattern TAG_PATTERN = Pattern.compile("<wicket:t>(.+?)</wicket:t>",+ Pattern.DOTALL | Pattern.CASE_INSENSITIVE);++ private static final Pattern ATTRIBUTE_PATTERN = Pattern.compile("\\Wt:[a-zA-Z]+\\s*=\\s*(\"[^\"]*?\"|'[^']*?')",+ Pattern.DOTALL | Pattern.CASE_INSENSITIVE);private static final Pattern STRING_LITERAL_PATTERN = Pattern.compile("\"((?:[^\"\\\\]|\\\\.)*)\"");- public static final Pattern EXTRACTED_KEYS_BLOCK_PATTERN = Pattern.compile("(\n\\s*//\\s*extracted\\s*keys\\s*\n)(.*)(\n\\s*//\\s*manually\\s*added\\s*keys)", Pattern.DOTALL|Pattern.CASE_INSENSITIVE);+ public static final Pattern EXTRACTED_KEYS_BLOCK_PATTERN = Pattern.compile(+ "(\n\\s*//\\s*extracted\\s*keys\\s*\n)(.*)(\n\\s*//\\s*manually\\s*added\\s*keys)",+ Pattern.DOTALL | Pattern.CASE_INSENSITIVE);- private static final Pattern TRANSLATION_PATTERN = Pattern.compile("m\\s*\\.\\s*put\\s*\\(\\s*\"((?:[^\"\\\\]|\\\\.)*)\"\\s*,\\s*\"((?:[^\"\\\\]|\\\\.)*)\"\\s*\\)\\s*;");+ private static final Pattern TRANSLATION_PATTERN = Pattern.compile(+ "m\\s*\\.\\s*put\\s*\\(\\s*\"((?:[^\"\\\\]|\\\\.)*)\"\\s*,\\s*\"((?:[^\"\\\\]|\\\\.)*)\"\\s*\\)\\s*;");private static final String TRANSLATE_PLACEHOLDER = "**** translate this ****";-+@Injectpublic ExtractTranslationKeys(HibernateConfig hibernateConfig) {super(hibernateConfig);@@ -61,123 +70,128 @@ public class ExtractTranslationKeys extends CommandHandler {@Overridepublic void start() {SecurityUtils.bindAsSystem();-+if (Bootstrap.command.getArgs().length == 0) {- logger.error("Missing OneDev project directory. Usage: {} <path to onedev project directory>", Bootstrap.command.getScript());+ logger.error("Missing OneDev project directory. Usage: {} <path to onedev project directory>",+ Bootstrap.command.getScript());System.exit(1);}-+var projectDir = new File(Bootstrap.command.getArgs()[0]);if (!projectDir.exists()) {logger.error("Unable to find directory: {}", projectDir.getAbsolutePath());System.exit(1);}-+if (!new File(projectDir, "server-core").exists()) {logger.error("Unable to find server-core under project dir: {}", projectDir.getAbsolutePath());System.exit(1);}-+logger.info("Extracting localization keys...");-+try {Set<String> extractedTranslationKeys = new TreeSet<>();Files.walk(projectDir.toPath())- .filter(it -> it.toString().endsWith(".class"))- .forEach(it -> {- var classPath = it;- String relative = null;- var parentPath = classPath.getParent();- while (!parentPath.equals(projectDir.toPath())) {- if (parentPath.getFileName().toString().equals("classes")) {- relative = parentPath.relativize(classPath).toString();- break;+ .filter(it -> it.toString().endsWith(".class"))+ .forEach(it -> {+ var classPath = it;+ String relative = null;+ var parentPath = classPath.getParent();+ while (!parentPath.equals(projectDir.toPath())) {+ if (parentPath.getFileName().toString().equals("classes")) {+ relative = parentPath.relativize(classPath).toString();+ break;+ }+ parentPath = parentPath.getParent();}- parentPath = parentPath.getParent();- }-- if (relative != null && relative.startsWith("io/onedev/server/")) {- var className = StringUtils.substringBeforeLast(relative, ".").replace("/", ".");- if (!className.endsWith("Panel") && !className.endsWith("Page") && !className.endsWith("Behavior")) {- try {- var clazz = Class.forName(className);- var editable = clazz.getAnnotation(Editable.class);- if (editable != null) {- extractedTranslationKeys.add(EditableUtils.getDisplayName(clazz));- var description = editable.description();- if (description.length() != 0) {- extractedTranslationKeys.add(description);- }- }- for (var method: clazz.getDeclaredMethods()) {- var annotation = method.getAnnotation(Editable.class);- if (annotation != null) {- extractedTranslationKeys.add(EditableUtils.getDisplayName(method));- var group = EditableUtils.getGroup(method);- if (group != null)- extractedTranslationKeys.add(group);- var description = annotation.description();++ if (relative != null && relative.startsWith("io/onedev/server/")) {+ var className = StringUtils.substringBeforeLast(relative, ".").replace("/", ".");+ if (!className.endsWith("Panel") && !className.endsWith("Page")+ && !className.endsWith("Behavior")) {+ try {+ var clazz = Class.forName(className);+ var editable = clazz.getAnnotation(Editable.class);+ if (editable != null) {+ extractedTranslationKeys.add(EditableUtils.getDisplayName(clazz));+ var description = editable.description();if (description.length() != 0) {extractedTranslationKeys.add(description);}- var placeholder = annotation.placeholder();- if (placeholder.length() != 0) {- extractedTranslationKeys.add(placeholder);+ }+ for (var method : clazz.getDeclaredMethods()) {+ var annotation = method.getAnnotation(Editable.class);+ if (annotation != null) {+ extractedTranslationKeys.add(EditableUtils.getDisplayName(method));+ var group = EditableUtils.getGroup(method);+ if (group != null)+ extractedTranslationKeys.add(group);+ var description = annotation.description();+ if (description.length() != 0) {+ extractedTranslationKeys.add(description);+ }+ var placeholder = annotation.placeholder();+ if (placeholder.length() != 0) {+ extractedTranslationKeys.add(placeholder);+ }+ var rootPlaceholder = annotation.rootPlaceholder();+ if (rootPlaceholder.length() != 0) {+ extractedTranslationKeys.add(rootPlaceholder);+ }+ }+ var notEmpty = method.getAnnotation(NotEmpty.class);+ if (notEmpty != null && notEmpty.message().length() != 0) {+ extractedTranslationKeys.add(notEmpty.message());}- var rootPlaceholder = annotation.rootPlaceholder();- if (rootPlaceholder.length() != 0) {- extractedTranslationKeys.add(rootPlaceholder);+ var notNull = method.getAnnotation(NotNull.class);+ if (notNull != null && notNull.message().length() != 0) {+ extractedTranslationKeys.add(notNull.message());+ }+ var size = method.getAnnotation(Size.class);+ if (size != null && size.message().length() != 0) {+ extractedTranslationKeys.add(size.message());}}- var notEmpty = method.getAnnotation(NotEmpty.class);- if (notEmpty != null && notEmpty.message().length() != 0) {- extractedTranslationKeys.add(notEmpty.message());- }- var notNull = method.getAnnotation(NotNull.class);- if (notNull != null && notNull.message().length() != 0) {- extractedTranslationKeys.add(notNull.message());- }- var size = method.getAnnotation(Size.class);- if (size != null && size.message().length() != 0) {- extractedTranslationKeys.add(size.message());- }- }- if (clazz.isEnum()) {- for (var constant: clazz.getEnumConstants()) {- extractedTranslationKeys.add(TextUtils.getDisplayValue((Enum<?>) constant));+ if (clazz.isEnum()) {+ for (var constant : clazz.getEnumConstants()) {+ extractedTranslationKeys.add(TextUtils.getDisplayValue((Enum<?>) constant));+ }}+ } catch (ClassNotFoundException e) {+ throw new RuntimeException(e);}- } catch (ClassNotFoundException e) {- throw new RuntimeException(e);}}- }- });-+ });+Files.walk(projectDir.toPath())- .filter(it -> it.toString().contains("src/main/java/io/onedev/server"))- .filter(it -> it.toString().endsWith(".java"))- .forEach(it -> {- try {- extractedTranslationKeys.addAll(extract_T(Files.readString(it)));- } catch (IOException e) {- throw new RuntimeException(e);- }- });+ .filter(it -> it.toString().contains("src/main/java/io/onedev/server"))+ .filter(it -> it.toString().endsWith(".java"))+ .forEach(it -> {+ try {+ extractedTranslationKeys.addAll(extractFromMethods(Files.readString(it)));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ });Files.walk(projectDir.toPath())- .filter(it -> it.toString().contains("src/main/java/io/onedev/server"))- .filter(it -> it.toString().endsWith(".html"))- .forEach(it -> {- try {- extractedTranslationKeys.addAll(extract_wicket_t(Files.readString(it)));- } catch (IOException e) {- throw new RuntimeException(e);- }- });-- for (var file: new File(projectDir, "server-core/src/main/java/" + Translation.class.getPackageName().replace(".", "/")).listFiles()) {+ .filter(it -> it.toString().contains("src/main/java/io/onedev/server"))+ .filter(it -> it.toString().endsWith(".html"))+ .forEach(it -> {+ try {+ var content = Files.readString(it);+ extractedTranslationKeys.addAll(extractFromTags(content));+ extractedTranslationKeys.addAll(extractFromAttributes(content));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ });++ for (var file : new File(projectDir,+ "server-core/src/main/java/" + Translation.class.getPackageName().replace(".", "/")).listFiles()) {if (file.getName().startsWith(Translation.class.getSimpleName() + "_")) {var content = updateTranslationKeys(Files.readString(file.toPath()), extractedTranslationKeys);Files.writeString(file.toPath(), content);@@ -191,9 +205,9 @@ public class ExtractTranslationKeys extends CommandHandler {System.exit(0);}- public static Collection<String> extract_T(String content) {+ public static Collection<String> extractFromMethods(String content) {var extracted = new ArrayList<String>();- Matcher matcher = _T_PATTERN.matcher(content);+ Matcher matcher = METHOD_PATTERN.matcher(content);while (matcher.find()) {StringBuilder key = new StringBuilder();String match = matcher.group(0);@@ -201,18 +215,30 @@ public class ExtractTranslationKeys extends CommandHandler {while (literalMatcher.find()) {key.append(unescapeJava(literalMatcher.group(1)));}- if (key.length() != 0)+ if (key.length() != 0)extracted.add(key.toString());}return extracted;}- public static Collection<String> extract_wicket_t(String content) {+ public static Collection<String> extractFromTags(String content) {var extracted = new ArrayList<String>();- Matcher matcher = WICKET_T_PATTERN.matcher(content);+ Matcher matcher = TAG_PATTERN.matcher(content);while (matcher.find()) {var key = matcher.group(1).trim().replaceAll("\\s+", " ");- if (key.length() != 0)+ if (key.length() != 0)+ extracted.add(key);+ }+ return extracted;+ }++ public static Collection<String> extractFromAttributes(String content) {+ var extracted = new ArrayList<String>();+ Matcher matcher = ATTRIBUTE_PATTERN.matcher(content);+ while (matcher.find()) {+ var key = matcher.group(1);+ key = HtmlEscape.unescapeHtml(key.substring(1, key.length() - 1).trim());+ if (key.length() != 0)extracted.add(key);}return extracted;@@ -231,25 +257,26 @@ public class ExtractTranslationKeys extends CommandHandler {while (translationMatcher.find()) {var key = unescapeJava(translationMatcher.group(1));var value = unescapeJava(translationMatcher.group(2));- if (!value.equals(TRANSLATE_PLACEHOLDER))+ if (!value.equals(TRANSLATE_PLACEHOLDER))existingTranslations.put(key, value);}existingTranslations.keySet().retainAll(extractedTranslationKeys);- for (var entry: existingTranslations.entrySet()) {+ for (var entry : existingTranslations.entrySet()) {addToTranslations(translations, entry.getKey(), entry.getValue());}extractedTranslationKeys.removeAll(existingTranslations.keySet());- for (var key: extractedTranslationKeys) {+ for (var key : extractedTranslationKeys) {addToTranslations(translations, key, null);}- matcher.appendReplacement(newContent, matcher.group(1) + Matcher.quoteReplacement(translations.toString()) + matcher.group(3));+ matcher.appendReplacement(newContent,+ matcher.group(1) + Matcher.quoteReplacement(translations.toString()) + matcher.group(3));matcher.appendTail(newContent);return newContent.toString();}private static void addToTranslations(StringBuffer translations, String key, @Nullable String value) {key = escapeJava(key, LEVEL_1_BASIC_ESCAPE_SET);- if (value != null)+ if (value != null)value = escapeJava(value, LEVEL_1_BASIC_ESCAPE_SET);elsevalue = "**** translate this ****";@@ -262,5 +289,5 @@ public class ExtractTranslationKeys extends CommandHandler {@Overridepublic void stop() {}-+}diff --git a/server-core/src/main/java/io/onedev/server/web/WebApplication.java b/server-core/src/main/java/io/onedev/server/web/WebApplication.javaindex b942263ab5..97c95d3236 100644--- a/server-core/src/main/java/io/onedev/server/web/WebApplication.java+++ b/server-core/src/main/java/io/onedev/server/web/WebApplication.java@@ -31,6 +31,9 @@ import org.apache.wicket.core.request.handler.PageProvider;import org.apache.wicket.core.request.handler.RenderPageRequestHandler;import org.apache.wicket.core.request.mapper.HomePageMapper;import org.apache.wicket.core.request.mapper.ResourceMapper;+import org.apache.wicket.markup.MarkupFactory;+import org.apache.wicket.markup.MarkupParser;+import org.apache.wicket.markup.MarkupResourceStream;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.pages.AbstractErrorPage;@@ -76,6 +79,7 @@ import io.onedev.server.web.resource.SpriteResourceStream;import io.onedev.server.web.resourcebundle.ResourceBundleReferences;import io.onedev.server.web.translation.TranslationResolver;import io.onedev.server.web.translation.TranslationStringResourceLoader;+import io.onedev.server.web.translation.TranslationTagHandler;import io.onedev.server.web.util.AbsoluteUrlRenderer;import io.onedev.server.web.websocket.WebSocketManager;import io.onedev.server.web.websocket.WebSocketMessages;@@ -105,9 +109,19 @@ public class WebApplication extends org.apache.wicket.protocol.http.WebApplicatigetMarkupSettings().setDefaultMarkupEncoding("UTF-8");getMarkupSettings().setStripComments(true);getMarkupSettings().setStripWicketTags(true);+ getMarkupSettings().setMarkupFactory(new MarkupFactory() {++ public MarkupParser newMarkupParser(final MarkupResourceStream resource) {+ var parser = new MarkupParser(newXmlPullParser(), resource);+ parser.add(new TranslationTagHandler(resource));+ return parser;+ }++ });getPageSettings().addComponentResolver(new SpriteImageResolver());getPageSettings().addComponentResolver(new TranslationResolver());+ getPageSettings().addComponentResolver(new TranslationTagHandler());getResourceSettings().getStringResourceLoaders().add(0, new TranslationStringResourceLoader());if (getConfigurationType() == RuntimeConfigurationType.DEVELOPMENT) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex e415318076..795b443f3a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -1,3 +1,3 @@<wicket:extend><a wicket:id="test">test</a>-</wicket:extend>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex eadba7a079..f664248f50 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -9,7 +9,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.web.page.base.BasePage;public class TestPage extends BasePage {-+public TestPage(PageParameters params) {super(params);}@@ -21,17 +21,17 @@ public class TestPage extends BasePage {add(new Link<Void>("test") {@Override- public void onClick() {- }-+ public void onClick() {+ }+});}-+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new TestResourceReference()));response.render(OnDomReadyHeaderItem.forScript("onedev.server.test.onDomReady();"));- }+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/translation/TranslationTagHandler.java b/server-core/src/main/java/io/onedev/server/web/translation/TranslationTagHandler.javanew file mode 100644index 0000000000..28c4b8b5ff--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/translation/TranslationTagHandler.java@@ -0,0 +1,156 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package io.onedev.server.web.translation;++import static io.onedev.server.web.translation.Translation._T;++import java.text.ParseException;+import java.util.HashMap;++import org.apache.wicket.Component;+import org.apache.wicket.MarkupContainer;+import org.apache.wicket.behavior.Behavior;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.MarkupElement;+import org.apache.wicket.markup.MarkupResourceStream;+import org.apache.wicket.markup.MarkupStream;+import org.apache.wicket.markup.html.TransparentWebMarkupContainer;+import org.apache.wicket.markup.html.WebComponent;+import org.apache.wicket.markup.parser.AbstractMarkupFilter;+import org.apache.wicket.markup.resolver.IComponentResolver;+++/**+ * This is a markup inline filter and a component resolver. It identifies wicket:message attributes+ * and adds an attribute modifier to the component tag that can localize+ * wicket:message="attr-name:i18n-key,attr-name-2:i18n-key-2,..." expressions, replacing values of+ * attributes specified by attr-name with a localizer lookup with key i18n-key. If an attribute+ * being localized has a set value that value will be used as the default value for the localization+ * lookup. This handler also resolves and localizes raw markup with wicket:message attribute.+ *+ * @author Juergen Donnerstag+ * @author Igor Vaynberg+ */+public final class TranslationTagHandler extends AbstractMarkupFilter+ implements+ IComponentResolver+{+ /** */+ private static final long serialVersionUID = 1L;++ /**+ * The id automatically assigned to tags with wicket:message attribute but without id+ */+ public final static String WICKET_MESSAGE_CONTAINER_ID = "_t_attr_";++ /**+ * Constructor for the IComponentResolver role.+ */+ public TranslationTagHandler()+ {+ this(null);+ }++ /**+ * Constructor for the IMarkupFilter role.+ */+ public TranslationTagHandler(final MarkupResourceStream markupResourceStream)+ {+ super(markupResourceStream);+ }++ @Override+ protected final MarkupElement onComponentTag(ComponentTag tag) throws ParseException+ {+ if (tag.isClose())+ {+ return tag;+ }++ boolean hasTranslationAttribute = false;+ for (var attribute : tag.getAttributes().keySet()) {+ if (attribute.startsWith("t:")) {+ hasTranslationAttribute = true;+ break;+ }+ }+ if (hasTranslationAttribute) {+ // check if this tag is raw markup+ if (tag.getId() == null)+ {+ // if this is a raw tag we need to set the id to something so+ // that wicket will not merge this as raw markup and instead+ // pass it on to a resolver+ tag.setId(getWicketMessageIdPrefix(null) + getRequestUniqueId());+ tag.setAutoComponentTag(true);+ tag.setModified(true);+ }+ tag.addBehavior(new AttributeLocalizer());+ }++ return tag;+ }++ public static class AttributeLocalizer extends Behavior+ {+ private static final long serialVersionUID = 1L;++ @Override+ public void onComponentTag(final Component component, final ComponentTag tag) {+ var translatedAttributes = new HashMap<String, String>();+ for (var entry : tag.getAttributes().entrySet()) {+ if (entry.getKey().startsWith("t:")) {+ var key = entry.getKey().substring(2);+ var value = entry.getValue();+ translatedAttributes.put(key, _T(value.toString()));+ }+ }+ for (var entry : translatedAttributes.entrySet()) {+ tag.remove("t:" + entry.getKey());+ tag.put(entry.getKey(), entry.getValue());+ }+ }+ }++ @Override+ public Component resolve(MarkupContainer container, MarkupStream markupStream, ComponentTag tag)+ {+ // localize any raw markup that has wicket:message attrs+ if ((tag != null) && (tag.getId().startsWith(getWicketMessageIdPrefix(markupStream))))+ {+ Component wc;+ String id = tag.getId();++ if (tag.isOpenClose())+ {+ wc = new WebComponent(id);+ }+ else+ {+ wc = new TransparentWebMarkupContainer(id);+ }++ return wc;+ }+ return null;+ }++ private String getWicketMessageIdPrefix(final MarkupStream markupStream)+ {+ return getWicketNamespace(markupStream) + WICKET_MESSAGE_CONTAINER_ID;+ }+}diff --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 99bcad1a4a..16bf8181bd 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@@ -77,6 +77,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Add a GPG Public Key", "添加一个 GPG 公钥");m.put("Add a SSH Key", "添加 SSH 密钥");m.put("Add after", "添加到后面");+ m.put("Add assignee...", "添加分配人员...");m.put("Add before", "添加到前面");m.put("Add child project", "添加子项目");m.put("Add comment on this selection", "在此选择上添加注释");@@ -87,6 +88,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Add new file", "添加新文件");m.put("Add new import", "添加新导入");m.put("Add project", "添加项目");+ m.put("Add reviewer...", "添加审查人员...");m.put("Add to batch to commit with other suggestions later", "稍后与其他建议一起提交");m.put("Add to group...", "添加到组...");m.put("Add {0}", "添加 {0}");@@ -2517,6 +2519,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Suggestion is outdated either due to code change or pull request close", "建议由于代码更改或合并请求关闭而过时");m.put("Support & Bug Report", "技术支持与错误报告");m.put("Support Request", "支持请求");+ m.put("Swap", "交换");m.put("Switch to HTTP(S)", "切换到 HTTP(S)");m.put("Switch to SSH", "切换到 SSH");m.put("Symbol name", "符号名称");@@ -2993,9 +2996,6 @@ 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("Add assignee...", "添加分配人员...");- m.put("Add reviewer...", "添加审查人员...");- m.put("Swap", "交换");// Manually added keysm.put("Create Administrator Account", "创建管理员账户");diff --git a/server-core/src/test/java/io/onedev/server/commandhandler/ExtractTranslationKeysTest.java b/server-core/src/test/java/io/onedev/server/commandhandler/ExtractTranslationKeysTest.javaindex c7b390702c..e344d11cbd 100644--- a/server-core/src/test/java/io/onedev/server/commandhandler/ExtractTranslationKeysTest.java+++ b/server-core/src/test/java/io/onedev/server/commandhandler/ExtractTranslationKeysTest.java@@ -9,60 +9,86 @@ import org.junit.Test;public class ExtractTranslationKeysTest {- @Test- public void testExtractWithMethod() {- String content = "text = _T( var )";- assertArrayEquals(new String[] {}, ExtractTranslationKeys.extract_T(content).toArray());-- content = "text = _T( var + \"string\")";- assertArrayEquals(new String[] {}, ExtractTranslationKeys.extract_T(content).toArray());-- content = "text = _T(\"a message\") + (_T(\"a message with \\\"quoted part\\\"\")) + _T(\"a message\\nanother message\")";- assertArrayEquals(new String[] {"a message", "a message with \"quoted part\"", "a message\nanother message"}, ExtractTranslationKeys.extract_T(content).toArray());-- content = "text = _T(\"a message with \\u00A0\\u00A1\\u00A2\\u00A3\\u00A4\\u00A5\\u00A6\\u00A7\\u00A8\\u00A9\\u00AA\\u00AB\\u00AC\\u00AD\\u00AE\\u00AF\\u00B0\\u00B1\\u00B2\\u00B3\\u00B4\\u00B5\\u00B6\\u00B7\\u00B8\\u00B9\\u00BA\\u00BB\\u00BC\\u00BD\\u00BE\\u00BF\")";- assertArrayEquals(new String[] {"a message with \u00A0\u00A1\u00A2\u00A3\u00A4\u00A5\u00A6\u00A7\u00A8\u00A9\u00AA\u00AB\u00AC\u00AD\u00AE\u00AF\u00B0\u00B1\u00B2\u00B3\u00B4\u00B5\u00B6\u00B7\u00B8\u00B9\u00BA\u00BB\u00BC\u00BD\u00BE\u00BF"}, ExtractTranslationKeys.extract_T(content).toArray());-- content = "text = _T(\"\")";- assertArrayEquals(new String[] {}, ExtractTranslationKeys.extract_T(content).toArray());-- content = "text = _T(\"\\t\\r\\n\\f\\b\\\\\")";- assertArrayEquals(new String[] {"\t\r\n\f\b\\"}, ExtractTranslationKeys.extract_T(content).toArray());-- content = "text = _T(\"line1\")\n + _T(\"line2\")\n + _T(\"line3\")";- assertArrayEquals(new String[] {"line1", "line2", "line3"}, ExtractTranslationKeys.extract_T(content).toArray());-- content = "text = _T(\"Unicode: \\u0048\\u0065\\u006C\\u006C\\u006F\")";- assertArrayEquals(new String[] {"Unicode: Hello"}, ExtractTranslationKeys.extract_T(content).toArray());-- content = "text = _T( \"spaced\" )";- assertArrayEquals(new String[] {"spaced"}, ExtractTranslationKeys.extract_T(content).toArray());-- content = "text = _T(\"double backslash: \\\\\\\\\")";- assertArrayEquals(new String[] {"double backslash: \\\\"}, ExtractTranslationKeys.extract_T(content).toArray());-- content = "text = _T(\"hello\" \n + \"world\")\n\n _T(\"one\" + \n \"two\"\n + \"three\")";- assertArrayEquals(new String[] {"helloworld", "onetwothree"}, ExtractTranslationKeys.extract_T(content).toArray());- }-- @Test- public void testExtractWithTag() {- String content = "<wicket:t>message1</wicket:t>\n<wicket:t><b>message2</b></wicket:t>\n<wicket:t>message\n3</wicket:t>";- assertArrayEquals(new String[] {"message1", "<b>message2</b>", "message 3"}, ExtractTranslationKeys.extract_wicket_t(content).toArray());-- content = "<wicket:t>\n\thello\n\t<br>\n\tworld\n</wicket:t>";- assertArrayEquals(new String[] {"hello <br> world"}, ExtractTranslationKeys.extract_wicket_t(content).toArray());- }-- @Test- public void testUpdateTranslationKeys() {- var content = "\n"- + "\t\t// Extracted keys\n"- + "\t\tm.put(\"message1\", \"消息$100\");\n"- + "\n"- + "\t\tm.put(\"message2\", \n\t\t\"**** translate this ****\");\n"- + "\n"- + "\t\t\t// Manually added keys";- assertEquals("\n\t\t// Extracted keys\n\t\tm.put(\"message1\", \"消息$100\");\n\t\tm.put(\"message2\", \"**** translate this ****\");\n\t\tm.put(\"message3\", \"**** translate this ****\");\n\n\t\t\t// Manually added keys", ExtractTranslationKeys.updateTranslationKeys(content, List.of("message1", "message2", "message3")));- }+ @Test+ public void testExtractFromMethod() {+ String content = "text = _T( var )";+ assertArrayEquals(new String[] {}, ExtractTranslationKeys.extractFromMethods(content).toArray());++ content = "text = _T( var + \"string\")";+ assertArrayEquals(new String[] {}, ExtractTranslationKeys.extractFromMethods(content).toArray());++ content = "text = _T(\"a message\") + (_T(\"a message with \\\"quoted part\\\"\")) + _T(\"a message\\nanother message\")";+ assertArrayEquals(+ new String[] { "a message", "a message with \"quoted part\"",+ "a message\nanother message" },+ ExtractTranslationKeys.extractFromMethods(content).toArray());++ content = "text = _T(\"a message with \\u00A0\\u00A1\\u00A2\\u00A3\\u00A4\\u00A5\\u00A6\\u00A7\\u00A8\\u00A9\\u00AA\\u00AB\\u00AC\\u00AD\\u00AE\\u00AF\\u00B0\\u00B1\\u00B2\\u00B3\\u00B4\\u00B5\\u00B6\\u00B7\\u00B8\\u00B9\\u00BA\\u00BB\\u00BC\\u00BD\\u00BE\\u00BF\")";+ assertArrayEquals(new String[] {+ "a message with \u00A0\u00A1\u00A2\u00A3\u00A4\u00A5\u00A6\u00A7\u00A8\u00A9\u00AA\u00AB\u00AC\u00AD\u00AE\u00AF\u00B0\u00B1\u00B2\u00B3\u00B4\u00B5\u00B6\u00B7\u00B8\u00B9\u00BA\u00BB\u00BC\u00BD\u00BE\u00BF" },+ ExtractTranslationKeys.extractFromMethods(content).toArray());++ content = "text = _T(\"\")";+ assertArrayEquals(new String[] {}, ExtractTranslationKeys.extractFromMethods(content).toArray());++ content = "text = _T(\"\\t\\r\\n\\f\\b\\\\\")";+ assertArrayEquals(new String[] { "\t\r\n\f\b\\" },+ ExtractTranslationKeys.extractFromMethods(content).toArray());++ content = "text = _T(\"line1\")\n + _T(\"line2\")\n + _T(\"line3\")";+ assertArrayEquals(new String[] { "line1", "line2", "line3" },+ ExtractTranslationKeys.extractFromMethods(content).toArray());++ content = "text = _T(\"Unicode: \\u0048\\u0065\\u006C\\u006C\\u006F\")";+ assertArrayEquals(new String[] { "Unicode: Hello" },+ ExtractTranslationKeys.extractFromMethods(content).toArray());++ content = "text = _T( \"spaced\" )";+ assertArrayEquals(new String[] { "spaced" },+ ExtractTranslationKeys.extractFromMethods(content).toArray());++ content = "text = _T(\"double backslash: \\\\\\\\\")";+ assertArrayEquals(new String[] { "double backslash: \\\\" },+ ExtractTranslationKeys.extractFromMethods(content).toArray());++ content = "text = _T(\"hello\" \n + \"world\")\n\n _T(\"one\" + \n \"two\"\n + \"three\")";+ assertArrayEquals(new String[] { "helloworld", "onetwothree" },+ ExtractTranslationKeys.extractFromMethods(content).toArray());+ }++ @Test+ public void testExtractFromTag() {+ String content = "<wicket:t>message1</wicket:t>\n<wicket:t><b>message2</b></wicket:t>\n<wicket:t>message\n3</wicket:t>";+ assertArrayEquals(new String[] { "message1", "<b>message2</b>", "message 3" },+ ExtractTranslationKeys.extractFromTags(content).toArray());++ content = "<wicket:t>\n\thello\n\t<br>\n\tworld\n</wicket:t>";+ assertArrayEquals(new String[] { "hello <br> world" },+ ExtractTranslationKeys.extractFromTags(content).toArray());+ }++ @Test+ public void testExtractFromAttribute() {+ String content = "<a t:title=\"message1\">message1</a>\n<a t:title='message2'>message2</a> <input t:placeholder = \"message '3' \" >message3</input> \n"+ + "<a t:title = ' message \"5\" '\nt:value='message \n "6'>message5</a> \n\n <div wicket:id='test'>test</div>";+ assertArrayEquals(+ new String[] { "message1", "message2", "message '3'", "message \"5\"",+ "message \n \"6" },+ ExtractTranslationKeys.extractFromAttributes(content).toArray());+ }++ @Test+ public void testUpdateTranslationKeys() {+ var content = "\n"+ + "\t\t// Extracted keys\n"+ + "\t\tm.put(\"message1\", \"消息$100\");\n"+ + "\n"+ + "\t\tm.put(\"message2\", \n\t\t\"**** translate this ****\");\n"+ + "\n"+ + "\t\t\t// Manually added keys";+ assertEquals(+ "\n\t\t// Extracted keys\n\t\tm.put(\"message1\", \"消息$100\");\n\t\tm.put(\"message2\", \"**** translate this ****\");\n\t\tm.put(\"message3\", \"**** translate this ****\");\n\n\t\t\t// Manually added keys",+ ExtractTranslationKeys.updateTranslationKeys(content,+ List.of("message1", "message2", "message3")));+ }}diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.javaindex c30cb89e40..ca31146827 100644--- a/server-product/src/test/java/io/onedev/server/product/Test.java+++ b/server-product/src/test/java/io/onedev/server/product/Test.java@@ -1,9 +1,9 @@package io.onedev.server.product;public class Test {-+@org.junit.Testpublic void test() {}--}\ No newline at end of file++}\ No newline at end of file