mirror of
https://gitflic.ru/project/openide/openide.git
synced 2025-12-14 18:05:27 +07:00
[i18n] move properties used in java.compiler* modules to CompilerBundle (IDEA-209382)
GitOrigin-RevId: aed6f06f197eb698f3859215c23dc7fcd40ce64d
This commit is contained in:
committed by
intellij-monorepo-bot
parent
79a94e4a9c
commit
ed516b96aa
@@ -15,8 +15,8 @@
|
|||||||
*/
|
*/
|
||||||
package com.intellij.compiler;
|
package com.intellij.compiler;
|
||||||
|
|
||||||
import com.intellij.codeInsight.CodeInsightBundle;
|
|
||||||
import com.intellij.ide.IconLayerProvider;
|
import com.intellij.ide.IconLayerProvider;
|
||||||
|
import com.intellij.openapi.compiler.CompilerBundle;
|
||||||
import com.intellij.openapi.components.ServiceManager;
|
import com.intellij.openapi.components.ServiceManager;
|
||||||
import com.intellij.openapi.project.Project;
|
import com.intellij.openapi.project.Project;
|
||||||
import com.intellij.openapi.roots.FileIndexFacade;
|
import com.intellij.openapi.roots.FileIndexFacade;
|
||||||
@@ -56,7 +56,7 @@ public class CompilerIconLayerProvider implements IconLayerProvider {
|
|||||||
@NotNull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
public String getLayerDescription() {
|
public String getLayerDescription() {
|
||||||
return CodeInsightBundle.message("node.excluded.flag.tooltip");
|
return CompilerBundle.message("node.excluded.flag.tooltip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isExcluded(final VirtualFile vFile, final Project project) {
|
public static boolean isExcluded(final VirtualFile vFile, final Project project) {
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ import com.intellij.openapi.progress.ProcessCanceledException;
|
|||||||
import com.intellij.openapi.progress.ProgressIndicator;
|
import com.intellij.openapi.progress.ProgressIndicator;
|
||||||
import com.intellij.openapi.progress.ProgressIndicatorProvider;
|
import com.intellij.openapi.progress.ProgressIndicatorProvider;
|
||||||
import com.intellij.openapi.project.Project;
|
import com.intellij.openapi.project.Project;
|
||||||
import com.intellij.openapi.project.ProjectBundle;
|
|
||||||
import com.intellij.openapi.projectRoots.Sdk;
|
import com.intellij.openapi.projectRoots.Sdk;
|
||||||
import com.intellij.openapi.roots.CompilerModuleExtension;
|
import com.intellij.openapi.roots.CompilerModuleExtension;
|
||||||
import com.intellij.openapi.roots.ModuleRootManager;
|
import com.intellij.openapi.roots.ModuleRootManager;
|
||||||
@@ -661,7 +660,7 @@ public final class CompileDriver {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!modulesWithoutJdkAssigned.isEmpty()) {
|
if (!modulesWithoutJdkAssigned.isEmpty()) {
|
||||||
showNotSpecifiedError("error.jdk.not.specified", projectSdkNotSpecified, modulesWithoutJdkAssigned, ProjectBundle.message("modules.classpath.title"));
|
showNotSpecifiedError("error.jdk.not.specified", projectSdkNotSpecified, modulesWithoutJdkAssigned, CompilerBundle.message("modules.classpath.title"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||||
package com.intellij.ide.macro;
|
package com.intellij.ide.macro;
|
||||||
|
|
||||||
import com.intellij.ide.IdeBundle;
|
|
||||||
import com.intellij.openapi.actionSystem.CommonDataKeys;
|
import com.intellij.openapi.actionSystem.CommonDataKeys;
|
||||||
import com.intellij.openapi.actionSystem.DataContext;
|
import com.intellij.openapi.actionSystem.DataContext;
|
||||||
|
import com.intellij.openapi.compiler.CompilerBundle;
|
||||||
import com.intellij.openapi.compiler.CompilerPaths;
|
import com.intellij.openapi.compiler.CompilerPaths;
|
||||||
import com.intellij.openapi.module.Module;
|
import com.intellij.openapi.module.Module;
|
||||||
import com.intellij.openapi.module.ModuleManager;
|
import com.intellij.openapi.module.ModuleManager;
|
||||||
@@ -27,7 +27,7 @@ public final class OutputPathMacro extends Macro {
|
|||||||
@NotNull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
return IdeBundle.message("macro.output.path");
|
return CompilerBundle.message("macro.output.path");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ package com.intellij.packaging.impl.elements;
|
|||||||
|
|
||||||
import com.intellij.openapi.compiler.CompilerBundle;
|
import com.intellij.openapi.compiler.CompilerBundle;
|
||||||
import com.intellij.openapi.project.Project;
|
import com.intellij.openapi.project.Project;
|
||||||
import com.intellij.openapi.project.ProjectBundle;
|
|
||||||
import com.intellij.openapi.roots.libraries.Library;
|
import com.intellij.openapi.roots.libraries.Library;
|
||||||
import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
|
import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
|
||||||
import com.intellij.packaging.artifacts.Artifact;
|
import com.intellij.packaging.artifacts.Artifact;
|
||||||
@@ -53,7 +52,7 @@ public class LibraryElementType extends ComplexPackagingElementType<LibraryPacka
|
|||||||
@NotNull
|
@NotNull
|
||||||
public List<? extends LibraryPackagingElement> chooseAndCreate(@NotNull ArtifactEditorContext context, @NotNull Artifact artifact,
|
public List<? extends LibraryPackagingElement> chooseAndCreate(@NotNull ArtifactEditorContext context, @NotNull Artifact artifact,
|
||||||
@NotNull CompositePackagingElement<?> parent) {
|
@NotNull CompositePackagingElement<?> parent) {
|
||||||
final List<Library> selected = context.chooseLibraries(ProjectBundle.message("dialog.title.packaging.choose.library"));
|
final List<Library> selected = context.chooseLibraries(CompilerBundle.message("dialog.title.packaging.choose.library"));
|
||||||
final List<LibraryPackagingElement> elements = new ArrayList<>();
|
final List<LibraryPackagingElement> elements = new ArrayList<>();
|
||||||
for (Library library : selected) {
|
for (Library library : selected) {
|
||||||
elements.add(new LibraryPackagingElement(library.getTable().getTableLevel(), library.getName(), null));
|
elements.add(new LibraryPackagingElement(library.getTable().getTableLevel(), library.getName(), null));
|
||||||
|
|||||||
@@ -16,12 +16,12 @@
|
|||||||
package com.intellij.packaging.impl.elements;
|
package com.intellij.packaging.impl.elements;
|
||||||
|
|
||||||
import com.intellij.icons.AllIcons;
|
import com.intellij.icons.AllIcons;
|
||||||
|
import com.intellij.openapi.compiler.CompilerBundle;
|
||||||
import com.intellij.openapi.module.Module;
|
import com.intellij.openapi.module.Module;
|
||||||
import com.intellij.openapi.module.ModulePointer;
|
import com.intellij.openapi.module.ModulePointer;
|
||||||
import com.intellij.openapi.module.ModulePointerManager;
|
import com.intellij.openapi.module.ModulePointerManager;
|
||||||
import com.intellij.openapi.module.ModuleType;
|
import com.intellij.openapi.module.ModuleType;
|
||||||
import com.intellij.openapi.project.Project;
|
import com.intellij.openapi.project.Project;
|
||||||
import com.intellij.openapi.project.ProjectBundle;
|
|
||||||
import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
|
import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
|
||||||
import com.intellij.packaging.artifacts.Artifact;
|
import com.intellij.packaging.artifacts.Artifact;
|
||||||
import com.intellij.packaging.elements.CompositePackagingElement;
|
import com.intellij.packaging.elements.CompositePackagingElement;
|
||||||
@@ -50,7 +50,7 @@ public abstract class ModuleElementTypeBase<E extends ModulePackagingElementBase
|
|||||||
public List<? extends PackagingElement<?>> chooseAndCreate(@NotNull ArtifactEditorContext context, @NotNull Artifact artifact,
|
public List<? extends PackagingElement<?>> chooseAndCreate(@NotNull ArtifactEditorContext context, @NotNull Artifact artifact,
|
||||||
@NotNull CompositePackagingElement<?> parent) {
|
@NotNull CompositePackagingElement<?> parent) {
|
||||||
List<Module> suitableModules = getSuitableModules(context);
|
List<Module> suitableModules = getSuitableModules(context);
|
||||||
List<Module> selected = context.chooseModules(suitableModules, ProjectBundle.message("dialog.title.packaging.choose.module"));
|
List<Module> selected = context.chooseModules(suitableModules, CompilerBundle.message("dialog.title.packaging.choose.module"));
|
||||||
|
|
||||||
final List<PackagingElement<?>> elements = new ArrayList<>();
|
final List<PackagingElement<?>> elements = new ArrayList<>();
|
||||||
final ModulePointerManager pointerManager = ModulePointerManager.getInstance(context.getProject());
|
final ModulePointerManager pointerManager = ModulePointerManager.getInstance(context.getProject());
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ public final class ExcludedEntriesConfigurable implements UnnamedConfigurable, N
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected JButton[] createButtons(){
|
protected JButton[] createButtons(){
|
||||||
final JButton addButton = new JButton(IdeBundle.message("button.add"));
|
final JButton addButton = new JButton(CompilerBundle.message("button.add"));
|
||||||
addButton.addActionListener(
|
addButton.addActionListener(
|
||||||
new ActionListener() {
|
new ActionListener() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -278,7 +278,6 @@ class.file.decompiled.text=Decompiled .class file
|
|||||||
settings.remote.repo.Maven.Repository.URL=maven Repository URL
|
settings.remote.repo.Maven.Repository.URL=maven Repository URL
|
||||||
project.roots.tooltip.library.has.broken.paths=Library ''{0}'' has broken {1, choice, 1#path|2#paths}.
|
project.roots.tooltip.library.has.broken.paths=Library ''{0}'' has broken {1, choice, 1#path|2#paths}.
|
||||||
module.sdk.not.defined=Module SDK is not defined
|
module.sdk.not.defined=Module SDK is not defined
|
||||||
modules.classpath.title=Dependencies
|
|
||||||
label.enter.artifact.name=Enter artifact name:
|
label.enter.artifact.name=Enter artifact name:
|
||||||
project.new.wizard.import.title=Import {0} from external &model
|
project.new.wizard.import.title=Import {0} from external &model
|
||||||
library.name.already.exists.error=Library \"{0}\" already exists
|
library.name.already.exists.error=Library \"{0}\" already exists
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ package com.intellij.openapi.roots.ui.configuration;
|
|||||||
import com.intellij.ProjectTopics;
|
import com.intellij.ProjectTopics;
|
||||||
import com.intellij.ide.JavaUiBundle;
|
import com.intellij.ide.JavaUiBundle;
|
||||||
import com.intellij.openapi.Disposable;
|
import com.intellij.openapi.Disposable;
|
||||||
|
import com.intellij.openapi.compiler.CompilerBundle;
|
||||||
import com.intellij.openapi.options.ConfigurationException;
|
import com.intellij.openapi.options.ConfigurationException;
|
||||||
import com.intellij.openapi.projectRoots.Sdk;
|
import com.intellij.openapi.projectRoots.Sdk;
|
||||||
import com.intellij.openapi.roots.ModifiableRootModel;
|
import com.intellij.openapi.roots.ModifiableRootModel;
|
||||||
@@ -206,6 +207,6 @@ public class ClasspathEditor extends ModuleElementsEditor implements ModuleRootL
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String getName() {
|
public static String getName() {
|
||||||
return JavaUiBundle.message("modules.classpath.title");
|
return CompilerBundle.message("modules.classpath.title");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -222,9 +222,6 @@ project.roots.project.display.name=Project
|
|||||||
sdk.configuration.exception=SDK ''{0}'' is invalid.
|
sdk.configuration.exception=SDK ''{0}'' is invalid.
|
||||||
project.roots.project.jdk.inherited=Project SDK
|
project.roots.project.jdk.inherited=Project SDK
|
||||||
project.roots.path.tab.title=Paths
|
project.roots.path.tab.title=Paths
|
||||||
dialog.title.packaging.choose.library=Choose Library
|
|
||||||
dialog.title.packaging.choose.module=Choose Module
|
|
||||||
|
|
||||||
error.message.unknown.facet.type.0=Unknown facet type: ''{0}''
|
error.message.unknown.facet.type.0=Unknown facet type: ''{0}''
|
||||||
error.message.cannot.load.facet.configuration.0=Cannot load facet configuration: {0}
|
error.message.cannot.load.facet.configuration.0=Cannot load facet configuration: {0}
|
||||||
error.message.facet.type.isn.t.specified=Facet type isn't specified
|
error.message.facet.type.isn.t.specified=Facet type isn't specified
|
||||||
|
|||||||
@@ -368,7 +368,6 @@ error.cannot.resolve.0.1=Cannot resolve {0} ''{1}''
|
|||||||
unknown.encoding.0=Unknown encoding: ''{0}''
|
unknown.encoding.0=Unknown encoding: ''{0}''
|
||||||
i18nize.cant.create.properties.file.because.its.name.is.associated=Can''t create properties file ''{0}'' because its name is associated with the {1}.
|
i18nize.cant.create.properties.file.because.its.name.is.associated=Can''t create properties file ''{0}'' because its name is associated with the {1}.
|
||||||
i18nize.error.creating.properties.file=Error creating properties file
|
i18nize.error.creating.properties.file=Error creating properties file
|
||||||
node.excluded.flag.tooltip=Excluded
|
|
||||||
multiple.implementations.tooltip=Multiple implementations
|
multiple.implementations.tooltip=Multiple implementations
|
||||||
# suppress inspection "UnusedProperty"
|
# suppress inspection "UnusedProperty"
|
||||||
intentions.category.ejb=EJB
|
intentions.category.ejb=EJB
|
||||||
|
|||||||
@@ -463,7 +463,6 @@ macro.module.file.name=The name of the module file without extension
|
|||||||
macro.affected.module.names=The names of the modules in the scope, comma separated
|
macro.affected.module.names=The names of the modules in the scope, comma separated
|
||||||
macro.compiler.context.is.make=Boolean value according to the performed compilation: true for make, false for force recompile
|
macro.compiler.context.is.make=Boolean value according to the performed compilation: true for make, false for force recompile
|
||||||
macro.module.source.path=Module source path
|
macro.module.source.path=Module source path
|
||||||
macro.output.path=Output path
|
|
||||||
macro.project.file.directory=The directory of the project file
|
macro.project.file.directory=The directory of the project file
|
||||||
macro.project.file.path=The path of the project file
|
macro.project.file.path=The path of the project file
|
||||||
macro.project.file.name=The name of the project file without extension
|
macro.project.file.name=The name of the project file without extension
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ progress.updating.caches=Updating caches...
|
|||||||
compiler.content.name.rebuild=Rebuild
|
compiler.content.name.rebuild=Rebuild
|
||||||
compiler.content.name.recompile=Recompile
|
compiler.content.name.recompile=Recompile
|
||||||
compiler.content.name.make=Build
|
compiler.content.name.make=Build
|
||||||
|
modules.classpath.title=Dependencies
|
||||||
status.compilation.completed.successfully.with.warnings=Build completed successfully with {0} {0,choice, 0#warnings|1#warning|2#warnings}
|
status.compilation.completed.successfully.with.warnings=Build completed successfully with {0} {0,choice, 0#warnings|1#warning|2#warnings}
|
||||||
status.compilation.completed.successfully=Build completed successfully
|
status.compilation.completed.successfully=Build completed successfully
|
||||||
status.compilation.completed.successfully.with.warnings.and.errors=Build completed with {0} {0,choice, 0#errors|1#error|2#errors} and {1} {1,choice, 0#warnings|1#warning|2#warnings}
|
status.compilation.completed.successfully.with.warnings.and.errors=Build completed with {0} {0,choice, 0#errors|1#error|2#errors} and {1} {1,choice, 0#warnings|1#warning|2#warnings}
|
||||||
@@ -225,4 +226,9 @@ action.text.move.to=Move to
|
|||||||
title.create.new.profile=Create new profile
|
title.create.new.profile=Create new profile
|
||||||
dialog.message.profile.name=Profile name
|
dialog.message.profile.name=Profile name
|
||||||
title.new.directory=New Directory
|
title.new.directory=New Directory
|
||||||
dialog.message.enter.directory.name=Enter directory name:
|
dialog.message.enter.directory.name=Enter directory name:
|
||||||
|
dialog.title.packaging.choose.module=Choose Module
|
||||||
|
dialog.title.packaging.choose.library=Choose Library
|
||||||
|
node.excluded.flag.tooltip=Excluded
|
||||||
|
macro.output.path=Output path
|
||||||
|
button.add=&Add...
|
||||||
Reference in New Issue
Block a user