i18n: i18n

GitOrigin-RevId: 939afe92f230b707a6a4d15bc9e113adb0ab78ff
This commit is contained in:
Anna Kozlova
2020-08-25 09:07:07 +00:00
committed by intellij-monorepo-bot
parent 320546d22a
commit bb48a83198
7 changed files with 15 additions and 7 deletions
@@ -85,3 +85,6 @@ unused.message.format.parameter.problem.descriptor=Using parameter {0} without u
intention.family.name.mark.as.nlssafe=Mark as @NlsSafe
capitalization.kind.title=title
capitalization.kind.sentence=sentence
value.column.name=Value
key.column.name=Key
command.name.edit.property.value=Edit Property Value
@@ -3,6 +3,7 @@ package com.intellij.codeInspection.duplicateStringLiteral;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.i18n.JavaI18nUtil;
import com.intellij.codeInspection.util.IntentionName;
import com.intellij.find.findUsages.PsiElement2UsageTargetAdapter;
import com.intellij.java.i18n.JavaI18nBundle;
import com.intellij.lang.java.JavaLanguage;
@@ -287,7 +288,7 @@ public class DuplicateStringLiteralInspection extends AbstractBaseJavaLocalInspe
}
private static final class ReplaceFix extends LocalQuickFixAndIntentionActionOnPsiElement {
private final String myText;
private final @IntentionName String myText;
@SafeFieldForPreview
private final SmartPsiElementPointer<PsiField> myConst;
@@ -19,6 +19,7 @@ import com.intellij.openapi.options.ShowSettingsUtil;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.ui.ex.MultiLineLabel;
import com.intellij.openapi.util.NlsSafe;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.ui.EditorComboBox;
@@ -242,7 +243,7 @@ public class JavaI18nizeQuickFixDialog extends I18nizeQuickFixDialog {
return myResourceBundleManager.suggestPropertiesFiles(myContextModules);
}
public @NotNull String getI18nizedText() {
public @NotNull @NlsSafe String getI18nizedText() {
String propertyKey = StringUtil.escapeStringCharacters(getKey());
I18nizedTextGenerator textGenerator = myResourceBundleManager.getI18nizedTextGenerator();
if (textGenerator != null) {
@@ -310,7 +310,7 @@ public class I18nizeMultipleStringsDialog<D> extends DialogWrapper {
@Override
public String getColumnName(int column) {
return column == 0 ? "Key" : "Value";
return column == 0 ? JavaI18nBundle.message("key.column.name") : JavaI18nBundle.message("value.column.name");
}
@Override
@@ -29,6 +29,7 @@ import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.JBPopupListener;
import com.intellij.openapi.ui.popup.LightweightWindowEvent;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.NlsSafe;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil;
@@ -289,7 +290,7 @@ public class EditPropertyValueAction extends BaseRefactoringAction {
return button;
}
private static LightweightHint showTooltip(@NotNull Editor editor, @Nullable VirtualFile file, @Nullable String key) {
private static LightweightHint showTooltip(@NotNull Editor editor, @Nullable VirtualFile file, @Nullable @NlsSafe String key) {
if (file == null && key == null) return null;
JPanel panel = new JPanel();
panel.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
@@ -341,7 +342,7 @@ public class EditPropertyValueAction extends BaseRefactoringAction {
Editor editor = foldRegion.getEditor();
JComponent editorComponent = editor.getContentComponent();
focusAndRun(editorComponent, () -> {
WriteCommandAction.runWriteCommandAction(project, "Edit property value", null, () -> {
WriteCommandAction.runWriteCommandAction(project, JavaI18nBundle.message("command.name.edit.property.value"), null, () -> {
handler.setValue(newValue.replace("\n", "\\n"));
String oldPlaceholder = foldRegion.getPlaceholderText();
String newPlaceholder = handler.getPlaceholder();
@@ -19,6 +19,7 @@ import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ProblemDescriptionsProcessor;
import com.intellij.codeInspection.reference.RefManager;
import com.intellij.lang.properties.psi.PropertiesFile;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.util.containers.BidirectionalMap;
import org.jetbrains.annotations.NotNull;
@@ -33,7 +34,7 @@ public interface InconsistentResourceBundleInspectionProvider {
@NotNull
String getName();
@NotNull
@NotNull @NlsContexts.Checkbox
String getPresentableName();
void check(BidirectionalMap<PropertiesFile, PropertiesFile> parents,
@@ -8,6 +8,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsActions;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.search.searches.ReferencesSearch;
@@ -103,7 +104,7 @@ public class InlinePropertyHandler extends JavaInlineActionHandler {
return getRefactoringName();
}
public static String getRefactoringName() {
public static @NlsActions.ActionText String getRefactoringName() {
return JavaI18nBundle.message("inline.property.refactoring");
}
}