From 5a0055cbeb90b0c6d80c223d4d68cc451d0ccfc1 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 May 2014 16:01:33 +0400 Subject: [PATCH] Fix message case in JetBundle.properties Intention names should be lowercase, family names should have each word except prepositions capitalized --- .../jetbrains/jet/plugin/JetBundle.properties | 52 +++++++++---------- ...QualifiedExpressionNotFirst.before.Main.kt | 2 +- .../beforeChangeFunctionParameterType4.kt | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties index 49c3e205664..942e3a1bf9b 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties +++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties @@ -224,16 +224,16 @@ unfold.call.to.when.family=Replace Method Call with 'when' Expression double.bang.to.if.then.exception.text=Expression ''{0}'' must not be null double.bang.to.if.then.choose.exception=Choose Exception Class double.bang.to.if.then=Replace '!!' expression with 'if' expression -double.bang.to.if.then.family=Replace '!!' Expression With 'if' Expression +double.bang.to.if.then.family=Replace '!!' Expression with 'if' Expression if.then.to.double.bang=Replace 'if' expression with '!!' expression if.then.to.double.bang.replace.exception=Replace 'if' expression with '!!' expression (will remove Exception) -if.then.to.double.bang.family=Replace 'if' expression With '!!' Expression +if.then.to.double.bang.family=Replace 'if' Expression with '!!' Expression elvis.to.if.then=Replace elvis expression with 'if' expression -elvis.to.if.then.family=Replace Elvis Expression With 'if' Expression +elvis.to.if.then.family=Replace Elvis Expression with 'if' Expression if.then.to.elvis=Replace 'if' expression with elvis expression -if.then.to.elvis.family=Replace 'if' expression With Elvis Expression +if.then.to.elvis.family=Replace 'if' Expression with Elvis Expression safe.access.to.if.then=Replace safe access expression with 'if' expression -safe.access.to.if.then.family=Replace Safe Access Expression With 'if' Expression +safe.access.to.if.then.family=Replace Safe Access Expression with 'if' Expression if.then.to.safe.access=Replace 'if' expression with safe access expression if.then.to.safe.access.family=Replace 'if' Expression with Safe Access Expression if.to.when=Replace 'if' with 'when' @@ -262,10 +262,10 @@ change.function.signature.action=Change function signature remove.unnecessary.parentheses=Remove unnecessary parentheses remove.unnecessary.parentheses.family=Remove Unnecessary Parentheses remove.unnecessary.curly.brackets.from.string.template=Remove curly braces from variable -remove.unnecessary.curly.brackets.from.string.template.family=Remove curly braces from variable +remove.unnecessary.curly.brackets.from.string.template.family=Remove Curly Braces From Variable insert.curly.brackets.to.string.template=Insert curly braces around variable -insert.curly.brackets.to.string.template.family=Insert curly braces around variable -swap.binary.expression=Flip Binary Expression +insert.curly.brackets.to.string.template.family=Insert Curly Braces Around Variable +swap.binary.expression=Flip binary expression swap.binary.expression.family=Flip Binary Expression add.name.to.argument.family=Add Name to Argument add.name.to.argument.single=Add name to argument\: ''{0}'' @@ -273,48 +273,48 @@ add.name.to.argument.multiple=Add name to argument... add.name.to.argument.action=Add name to argument... add.name.to.parameter.name.chooser.title=Choose parameter name replace.with.dot.qualified.method.call.intention=Replace with simple method call -replace.with.dot.qualified.method.call.intention.family=Replace with simple method call +replace.with.dot.qualified.method.call.intention.family=Replace with Simple Method Call replace.with.infix.function.call.intention=Replace with infix function call -replace.with.infix.function.call.intention.family=Replace with infix function call +replace.with.infix.function.call.intention.family=Replace with Infix Function Call replace.explicit.function.literal.param.with.it=Replace explicit parameter ''{0}'' with ''it'' -replace.explicit.function.literal.param.with.it.family=Replace Explicit Parameter With 'it' +replace.explicit.function.literal.param.with.it.family=Replace Explicit Parameter with 'it' move.lambda.inside.parentheses=Move lambda function into parentheses -move.lambda.inside.parentheses.family=Move lambda function into parentheses +move.lambda.inside.parentheses.family=Move Lambda Function Into Parentheses move.lambda.outside.parentheses=Move lambda expression out of parentheses -move.lambda.outside.parentheses.family=Move lambda expression out of parentheses +move.lambda.outside.parentheses.family=Move Lambda Expression out of Parentheses replace.it.with.explicit.function.literal.param=Replace 'it' with explicit parameter -replace.it.with.explicit.function.literal.param.family=Replace 'it' With Explicit Parameter +replace.it.with.explicit.function.literal.param.family=Replace 'it' with Explicit Parameter remove.braces=Remove braces remove.braces.family=Remove Braces add.braces=Add braces add.braces.family=Add Braces convert.negated.boolean.sequence=Replace negated sequence with DeMorgan equivalent -convert.negated.boolean.sequence.family=Replace negated sequence with DeMorgan equivalent -convert.negated.expression.with.demorgans.law=Convert negated expression to DeMorgan's equivalent -convert.negated.expression.with.demorgans.law.family=Convert negated expression to DeMorgan's equivalent +convert.negated.boolean.sequence.family=Replace Negated Sequence with DeMorgan Equivalent +convert.negated.expression.with.demorgans.law=Convert negated expression to DeMorgan equivalent +convert.negated.expression.with.demorgans.law.family=Convert Negated Expression to DeMorgan Equivalent split.if=Split into 2 if's split.if.family=Split If -replace.with.operator.assign.intention=Replace with an Operator-Assign Expression +replace.with.operator.assign.intention=Replace with an operator-assign expression replace.with.operator.assign.intention.family=Replace with an Operator-Assign Expression -replace.with.traditional.assignment.intention=Replace with Traditional Assignment +replace.with.traditional.assignment.intention=Replace with traditional assignment replace.with.traditional.assignment.intention.family=Replace with Traditional Assignment simplify.boolean.with.constants=Simplify boolean expression -simplify.boolean.with.constants.family=Simplify boolean expression +simplify.boolean.with.constants.family=Simplify Boolean Expression insert.explicit.type.arguments=Add explicit type arguments -insert.explicit.type.arguments.family=Add explicit type arguments +insert.explicit.type.arguments.family=Add Explicit Type Arguments remove.explicit.type.arguments=Remove explicit type arguments -remove.explicit.type.arguments.family=Remove explicit type arguments +remove.explicit.type.arguments.family=Remove Explicit Type Arguments convert.assert.to.if.with.throw=Replace 'assert' with 'if' statement -convert.assert.to.if.with.throw.family=Replace 'assert' with 'if' statement +convert.assert.to.if.with.throw.family=Replace 'assert' with 'if' Statement convert.if.with.throw.to.assert=Replace 'if' with 'assert' statement -convert.if.with.throw.to.assert.family=Replace 'if' with 'assert' statement +convert.if.with.throw.to.assert.family=Replace 'if' with 'assert' Statement make.type.explicit.in.lambda=Make types explicit in lambda make.type.explicit.in.lambda.family=Make Types Explicit In Lambda make.type.implicit.in.lambda=Make types implicit in lambda (may break code) make.type.implicit.in.lambda.family=Make Types Implicit In Lambda (May Break Code) -convert.to.for.each.loop.intention=Replace with a For Each Loop +convert.to.for.each.loop.intention=Replace with a for each loop convert.to.for.each.loop.intention.family=Replace with a For Each Loop -convert.to.for.each.function.call.intention=Replace with a forEach Function Call +convert.to.for.each.function.call.intention=Replace with a forEach function call convert.to.for.each.function.call.intention.family=Replace with a forEach Function Call property.is.implemented.too.many=Has implementations diff --git a/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt b/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt index 7c0b0a41c35..23551200097 100644 --- a/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt +++ b/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt @@ -2,7 +2,7 @@ // ERROR: Unresolved reference: SomeTest // ACTION: Edit intention settings // ACTION: Replace safe access expression with 'if' expression -// ACTION: Disable 'Replace Safe Access Expression With 'if' Expression' +// ACTION: Disable 'Replace Safe Access Expression with 'if' Expression' package testing diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType4.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType4.kt index 4337bfe4590..8caa98a7e73 100644 --- a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType4.kt +++ b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType4.kt @@ -1,7 +1,7 @@ // "Change parameter 'z' type of function 'foo' to '(Int) -> String'" "false" // ERROR: Type mismatch.
Required:kotlin.Int
Found:kotlin.String
-// ACTION: Disable 'Move lambda function into parentheses' +// ACTION: Disable 'Move Lambda Function Into Parentheses' // ACTION: Edit intention settings // ACTION: Move lambda function into parentheses