mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-04-20 13:31:28 +07:00
[xml] WEB-68929 Move highlighting options localization to XmlCoreBundle
GitOrigin-RevId: ab7f587126510fe73509cc2bbfe8d7f09ac60dd3
This commit is contained in:
Victor Turansky
committed by
intellij-monorepo-bot
intellij-monorepo-bot
parent
871f112533
commit
fb10a5bc25
@@ -19,6 +19,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.refactoring" />
|
||||
<orderEntry type="module" module-name="intellij.platform.indexing.impl" />
|
||||
<orderEntry type="module" module-name="intellij.platform.usageView" />
|
||||
<orderEntry type="module" module-name="intellij.xml.frontback.impl" />
|
||||
<orderEntry type="module" module-name="intellij.xml.psi.impl" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.xml.analysis.impl" exported="" />
|
||||
<orderEntry type="module" module-name="intellij.xml.structureView.impl" exported="" />
|
||||
|
||||
@@ -8,7 +8,7 @@ import com.intellij.openapi.options.Configurable;
|
||||
import com.intellij.openapi.util.NlsContexts.ConfigurableName;
|
||||
import com.intellij.psi.codeStyle.*;
|
||||
import com.intellij.psi.formatter.xml.HtmlCodeStyleSettings;
|
||||
import com.intellij.xml.XmlBundle;
|
||||
import com.intellij.xml.XmlCoreBundle;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@@ -27,7 +27,7 @@ public class HtmlLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett
|
||||
}
|
||||
|
||||
public static @ConfigurableName String getDisplayName() {
|
||||
return XmlBundle.message("options.html.display.name");
|
||||
return XmlCoreBundle.message("options.html.display.name");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -5,17 +5,18 @@ import com.intellij.openapi.options.UiDslUnnamedConfigurable
|
||||
import com.intellij.ui.dsl.builder.Panel
|
||||
import com.intellij.ui.dsl.builder.bindSelected
|
||||
import com.intellij.xml.XmlBundle
|
||||
import com.intellij.xml.XmlCoreBundle
|
||||
|
||||
class XmlCodeCompletionConfigurable : UiDslUnnamedConfigurable.Simple(), Configurable {
|
||||
|
||||
override fun getDisplayName(): String {
|
||||
return XmlBundle.message("options.html.display.name")
|
||||
return XmlCoreBundle.message("options.html.display.name")
|
||||
}
|
||||
|
||||
override fun Panel.createContent() {
|
||||
val htmlSettings = HtmlSettings.getInstance()
|
||||
|
||||
group(XmlBundle.message("options.html.display.name")) {
|
||||
group(XmlCoreBundle.message("options.html.display.name")) {
|
||||
row {
|
||||
checkBox(XmlBundle.message("checkbox.enable.completion.html.auto.popup.code.completion.on.typing.in.text"))
|
||||
.bindSelected({ htmlSettings.AUTO_POPUP_TAG_CODE_COMPLETION_ON_TYPING_IN_TEXT }, { htmlSettings.AUTO_POPUP_TAG_CODE_COMPLETION_ON_TYPING_IN_TEXT = it })
|
||||
|
||||
@@ -18,10 +18,11 @@ package com.intellij.application.options.editor;
|
||||
|
||||
import com.intellij.openapi.options.BeanConfigurable;
|
||||
import com.intellij.xml.XmlBundle;
|
||||
import com.intellij.xml.XmlCoreBundle;
|
||||
|
||||
public class XmlCodeFoldingOptionsProvider extends BeanConfigurable<XmlFoldingSettings.State> implements CodeFoldingOptionsProvider {
|
||||
public XmlCodeFoldingOptionsProvider() {
|
||||
super(XmlFoldingSettings.getInstance().getState(), XmlBundle.message("options.xml.display.name"));
|
||||
super(XmlFoldingSettings.getInstance().getState(), XmlCoreBundle.message("options.xml.display.name"));
|
||||
XmlFoldingSettings settings = XmlFoldingSettings.getInstance();
|
||||
checkBox(XmlBundle.message("checkbox.collapse.xml.tags"), settings::isCollapseXmlTags, value->settings.getState().COLLAPSE_XML_TAGS=value);
|
||||
checkBox(XmlBundle.message("checkbox.collapse.html.style.attribute"),settings::isCollapseHtmlStyleAttribute, value->settings.getState().COLLAPSE_HTML_STYLE_ATTRIBUTE=value);
|
||||
|
||||
@@ -13,7 +13,7 @@ import com.intellij.openapi.options.OptionsBundle;
|
||||
import com.intellij.openapi.options.colors.AttributesDescriptor;
|
||||
import com.intellij.openapi.options.colors.ColorDescriptor;
|
||||
import com.intellij.openapi.options.colors.ColorSettingsPage;
|
||||
import com.intellij.xml.XmlBundle;
|
||||
import com.intellij.xml.XmlCoreBundle;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import javax.swing.*;
|
||||
@@ -21,21 +21,21 @@ import java.util.Map;
|
||||
|
||||
public class HTMLColorsPage implements ColorSettingsPage {
|
||||
private static final AttributesDescriptor[] ATTRS = new AttributesDescriptor[] {
|
||||
new AttributesDescriptor(XmlBundle.message("options.html.attribute.descriptor.code"), XmlHighlighterColors.HTML_CODE),
|
||||
new AttributesDescriptor(XmlBundle.message("options.html.attribute.descriptor.comment"), XmlHighlighterColors.HTML_COMMENT),
|
||||
new AttributesDescriptor(XmlBundle.message("options.html.attribute.descriptor.tag"), XmlHighlighterColors.HTML_TAG),
|
||||
new AttributesDescriptor(XmlBundle.message("options.xml.attribute.descriptor.tag.name.custom"), XmlHighlighterColors.HTML_CUSTOM_TAG_NAME),
|
||||
new AttributesDescriptor(XmlBundle.message("options.html.attribute.descriptor.tag.name"), XmlHighlighterColors.HTML_TAG_NAME),
|
||||
new AttributesDescriptor(XmlBundle.message("options.html.attribute.descriptor.attribute.name"), XmlHighlighterColors.HTML_ATTRIBUTE_NAME),
|
||||
new AttributesDescriptor(XmlBundle.message("options.html.attribute.descriptor.attribute.value"), XmlHighlighterColors.HTML_ATTRIBUTE_VALUE),
|
||||
new AttributesDescriptor(XmlBundle.message("options.html.attribute.descriptor.entity.reference"), XmlHighlighterColors.HTML_ENTITY_REFERENCE),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.html.attribute.descriptor.code"), XmlHighlighterColors.HTML_CODE),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.html.attribute.descriptor.comment"), XmlHighlighterColors.HTML_COMMENT),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.html.attribute.descriptor.tag"), XmlHighlighterColors.HTML_TAG),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.xml.attribute.descriptor.tag.name.custom"), XmlHighlighterColors.HTML_CUSTOM_TAG_NAME),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.html.attribute.descriptor.tag.name"), XmlHighlighterColors.HTML_TAG_NAME),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.html.attribute.descriptor.attribute.name"), XmlHighlighterColors.HTML_ATTRIBUTE_NAME),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.html.attribute.descriptor.attribute.value"), XmlHighlighterColors.HTML_ATTRIBUTE_VALUE),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.html.attribute.descriptor.entity.reference"), XmlHighlighterColors.HTML_ENTITY_REFERENCE),
|
||||
new AttributesDescriptor(OptionsBundle.message("options.any.color.descriptor.injected.language.fragment"), XmlHighlighterColors.HTML_INJECTED_LANGUAGE_FRAGMENT),
|
||||
};
|
||||
private static final String FULL_PRODUCT_NAME = ApplicationNamesInfo.getInstance().getFullProductName();
|
||||
|
||||
@Override
|
||||
public @NotNull String getDisplayName() {
|
||||
return XmlBundle.message("options.html.display.name");
|
||||
return XmlCoreBundle.message("options.html.display.name");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -56,7 +56,7 @@ public class HTMLColorsPage implements ColorSettingsPage {
|
||||
final ColorDescriptor[] colorDescriptors = new ColorDescriptor[colorKeys.length];
|
||||
|
||||
for (int i = 0; i < colorDescriptors.length; i++) {
|
||||
colorDescriptors[i] = new ColorDescriptor(XmlBundle.message("options.html.attribute.descriptor.tag.tree", i + 1),
|
||||
colorDescriptors[i] = new ColorDescriptor(XmlCoreBundle.message("options.html.attribute.descriptor.tag.tree", i + 1),
|
||||
colorKeys[i], ColorDescriptor.Kind.BACKGROUND);
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import com.intellij.openapi.options.OptionsBundle;
|
||||
import com.intellij.openapi.options.colors.AttributesDescriptor;
|
||||
import com.intellij.openapi.options.colors.ColorDescriptor;
|
||||
import com.intellij.openapi.options.colors.ColorSettingsPage;
|
||||
import com.intellij.xml.XmlBundle;
|
||||
import com.intellij.xml.XmlCoreBundle;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import javax.swing.*;
|
||||
@@ -18,23 +18,23 @@ import java.util.Map;
|
||||
|
||||
public class XMLColorsPage implements ColorSettingsPage {
|
||||
private static final AttributesDescriptor[] ATTRS = new AttributesDescriptor[] {
|
||||
new AttributesDescriptor(XmlBundle.message("options.xml.attribute.descriptor.prologue"), XmlHighlighterColors.XML_PROLOGUE),
|
||||
new AttributesDescriptor(XmlBundle.message("options.xml.attribute.descriptor.comment"), XmlHighlighterColors.XML_COMMENT),
|
||||
new AttributesDescriptor(XmlBundle.message("options.xml.attribute.descriptor.tag"), XmlHighlighterColors.XML_TAG),
|
||||
new AttributesDescriptor(XmlBundle.message("options.xml.attribute.descriptor.tag.name"), XmlHighlighterColors.XML_TAG_NAME),
|
||||
new AttributesDescriptor(XmlBundle.message("options.xml.attribute.descriptor.tag.name.custom"), XmlHighlighterColors.XML_CUSTOM_TAG_NAME),
|
||||
new AttributesDescriptor(XmlBundle.message("options.xml.attribute.descriptor.matched.tag.name"), XmlHighlighterColors.MATCHED_TAG_NAME),
|
||||
new AttributesDescriptor(XmlBundle.message("options.xml.attribute.descriptor.namespace.prefix"), XmlHighlighterColors.XML_NS_PREFIX),
|
||||
new AttributesDescriptor(XmlBundle.message("options.xml.attribute.descriptor.attribute.name"), XmlHighlighterColors.XML_ATTRIBUTE_NAME),
|
||||
new AttributesDescriptor(XmlBundle.message("options.xml.attribute.descriptor.attribute.value"), XmlHighlighterColors.XML_ATTRIBUTE_VALUE),
|
||||
new AttributesDescriptor(XmlBundle.message("options.xml.attribute.descriptor.tag.data"), XmlHighlighterColors.XML_TAG_DATA),
|
||||
new AttributesDescriptor(XmlBundle.message("options.xml.attribute.descriptor.descriptor.entity,reference"), XmlHighlighterColors.XML_ENTITY_REFERENCE),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.xml.attribute.descriptor.prologue"), XmlHighlighterColors.XML_PROLOGUE),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.xml.attribute.descriptor.comment"), XmlHighlighterColors.XML_COMMENT),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.xml.attribute.descriptor.tag"), XmlHighlighterColors.XML_TAG),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.xml.attribute.descriptor.tag.name"), XmlHighlighterColors.XML_TAG_NAME),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.xml.attribute.descriptor.tag.name.custom"), XmlHighlighterColors.XML_CUSTOM_TAG_NAME),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.xml.attribute.descriptor.matched.tag.name"), XmlHighlighterColors.MATCHED_TAG_NAME),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.xml.attribute.descriptor.namespace.prefix"), XmlHighlighterColors.XML_NS_PREFIX),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.xml.attribute.descriptor.attribute.name"), XmlHighlighterColors.XML_ATTRIBUTE_NAME),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.xml.attribute.descriptor.attribute.value"), XmlHighlighterColors.XML_ATTRIBUTE_VALUE),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.xml.attribute.descriptor.tag.data"), XmlHighlighterColors.XML_TAG_DATA),
|
||||
new AttributesDescriptor(XmlCoreBundle.message("options.xml.attribute.descriptor.descriptor.entity,reference"), XmlHighlighterColors.XML_ENTITY_REFERENCE),
|
||||
new AttributesDescriptor(OptionsBundle.message("options.any.color.descriptor.injected.language.fragment"), XmlHighlighterColors.XML_INJECTED_LANGUAGE_FRAGMENT),
|
||||
};
|
||||
|
||||
@Override
|
||||
public @NotNull String getDisplayName() {
|
||||
return XmlBundle.message("options.xml.display.name");
|
||||
return XmlCoreBundle.message("options.xml.display.name");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -240,55 +240,34 @@ editbox.keep.blank.lines=Keep blank lines:
|
||||
dialog.edit.template.checkbox.xsl.text=XSL Text
|
||||
checkbox.wrap.text=Wrap text
|
||||
label.remove.new.line.before=Remove new line before:
|
||||
options.html.attribute.descriptor.tag.name=Tag name
|
||||
options.xml.attribute.descriptor.attribute.name=Attribute Name
|
||||
checkbox.collapse.html.style.attribute=HTML 'style' attribute
|
||||
inline.elements=Inline elements:
|
||||
options.xml.attribute.descriptor.prologue=Prologue
|
||||
label.lines=lines
|
||||
emmet.filter.comment.tags=Comment tags
|
||||
options.html.attribute.descriptor.entity.reference=Entity reference
|
||||
options.html.attribute.descriptor.code=HTML code
|
||||
options.html.attribute.descriptor.comment=Comment
|
||||
label.keep.white.spaces.inside=Keep white spaces inside:
|
||||
title.xml=XML
|
||||
options.html.attribute.descriptor.tag.tree=Tag tree (level {0})
|
||||
options.xml.display.name=XML
|
||||
options.html.attribute.descriptor.attribute.name=Attribute name
|
||||
label.or.if.tag.size.more.than=or if tag size more than
|
||||
checkbox.keep.line.breaks.in.text=Keep line breaks in text
|
||||
checkbox.keep.line.breaks=Keep line breaks
|
||||
dialog.edit.template.checkbox.html=&HTML
|
||||
action.name.show.history.for.tag=Tag
|
||||
options.xml.attribute.descriptor.namespace.prefix=Namespace Prefix
|
||||
checkbox.align.text=Align text
|
||||
options.html.attribute.descriptor.attribute.value=Attribute value
|
||||
options.html.display.name=HTML
|
||||
checkbox.align.attributes=Align attributes
|
||||
checkbox.keep.white.spaces=Keep white spaces
|
||||
checkbox.spaces.in.empty.tag=In empty tag
|
||||
label.insert.new.line.before=Insert new line before:
|
||||
label.do.not.indent.children.of=Do not indent children of:
|
||||
options.xml.attribute.descriptor.descriptor.entity,reference=Entity Reference
|
||||
html.label.new.line.before.first.attribute=New line before &first attribute:
|
||||
checkbox.spaces.around.equals.in.attribute=Around "=" in attribute
|
||||
checkbox.collapse.entities=XML entities
|
||||
options.xml.attribute.descriptor.matched.tag.name=Matched Tag
|
||||
html.label.new.line.after.last.attribute=New line after &last attribute:
|
||||
dialog.edit.template.checkbox.html.text=HTML Text
|
||||
options.xml.attribute.descriptor.comment=Comment
|
||||
dialog.edit.template.checkbox.xml=&XML
|
||||
don.t.break.if.inline.content=Don't break if inline content:
|
||||
options.xml.attribute.descriptor.attribute.value=Attribute Value
|
||||
options.xml.attribute.descriptor.tag.name=Tag Name
|
||||
checkbox.spaces.around.tag.name=After tag name
|
||||
checkbox.collapse.data.uri=Data URIs
|
||||
generated.quote.enforce.format=Enforce on format
|
||||
options.xml.attribute.descriptor.tag=Tag
|
||||
options.xml.attribute.descriptor.tag.data=Tag Data
|
||||
action.name.show.history.for.text=Text
|
||||
options.html.attribute.descriptor.tag=Tag
|
||||
options.xml.attribute.descriptor.tag.name.custom=Custom Tag Name
|
||||
inspection.javadoc.html.not.required.label.text=Additional not required html attributes:
|
||||
checkbox.uniform.indent=Use HTML indents within <style> and <script> tags
|
||||
hint.text.removed.namespace=Removed {0} {1, choice, 0#namespaces|1#namespace}
|
||||
|
||||
@@ -3,3 +3,27 @@ filetype.dtd.description=XML Document Type Definition
|
||||
filetype.html.description=HTML
|
||||
filetype.xhtml.description=XHTML
|
||||
filetype.xml.description=XML
|
||||
|
||||
# Highlighting categories
|
||||
options.xml.display.name=XML
|
||||
options.xml.attribute.descriptor.attribute.name=Attribute Name
|
||||
options.xml.attribute.descriptor.attribute.value=Attribute Value
|
||||
options.xml.attribute.descriptor.comment=Comment
|
||||
options.xml.attribute.descriptor.descriptor.entity,reference=Entity Reference
|
||||
options.xml.attribute.descriptor.matched.tag.name=Matched Tag
|
||||
options.xml.attribute.descriptor.namespace.prefix=Namespace Prefix
|
||||
options.xml.attribute.descriptor.prologue=Prologue
|
||||
options.xml.attribute.descriptor.tag.data=Tag Data
|
||||
options.xml.attribute.descriptor.tag.name.custom=Custom Tag Name
|
||||
options.xml.attribute.descriptor.tag.name=Tag Name
|
||||
options.xml.attribute.descriptor.tag=Tag
|
||||
|
||||
options.html.display.name=HTML
|
||||
options.html.attribute.descriptor.attribute.name=Attribute name
|
||||
options.html.attribute.descriptor.attribute.value=Attribute value
|
||||
options.html.attribute.descriptor.code=HTML code
|
||||
options.html.attribute.descriptor.comment=Comment
|
||||
options.html.attribute.descriptor.entity.reference=Entity reference
|
||||
options.html.attribute.descriptor.tag.name=Tag name
|
||||
options.html.attribute.descriptor.tag.tree=Tag tree (level {0})
|
||||
options.html.attribute.descriptor.tag=Tag
|
||||
Reference in New Issue
Block a user