deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

rename translation literals

Browse source
This commit is contained in:
Thibault Duplessis 2017-05-27 11:04:15 +02:00
parent f2a1c43c6e
commit c16e51c50e
3 changed files with 46 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
modules/i18n/src/main/I18nDb.scala
View file

@ -14,49 +14,49 @@ object I18nDb {
val langs = all.keySet
private def playDefaultMessages: Map[MessageKey, Translation] = Map(
"constraint.required" -> Singular("Required"),
"constraint.min" -> Singular("Minimum value: {0}"),
"constraint.max" -> Singular("Maximum value: {0}"),
"constraint.minLength" -> Singular("Minimum length: {0}"),
"constraint.maxLength" -> Singular("Maximum length: {0}"),
"constraint.email" -> Singular("Email"),
"format.date" -> Singular("Date (''{0}'')"),
"format.numeric" -> Singular("Numeric"),
"format.real" -> Singular("Real"),
"format.uuid" -> Singular("UUID"),
"error.invalid" -> Singular("Invalid value"),
"error.invalid.java.util.Date" -> Singular("Invalid date value"),
"error.required" -> Singular("This field is required"),
"error.number" -> Singular("Numeric value expected"),
"error.real" -> Singular("Real number value expected"),
"error.real.precision" -> Singular("Real number value with no more than {0} digit(s) including {1} decimal(s) expected"),
"error.min" -> Singular("Must be greater or equal to {0}"),
"error.min.strict" -> Singular("Must be strictly greater than {0}"),
"error.max" -> Singular("Must be less or equal to {0}"),
"error.max.strict" -> Singular("Must be strictly less than {0}"),
"error.minLength" -> Singular("Minimum length is {0}"),
"error.maxLength" -> Singular("Maximum length is {0}"),
"error.email" -> Singular("Valid email required"),
"error.pattern" -> Singular("Must satisfy {0}"),
"error.date" -> Singular("Valid date required"),
"error.uuid" -> Singular("Valid UUID required"),
"error.expected.date" -> Singular("Date value expected"),
"error.expected.date.isoformat" -> Singular("Iso date value expected"),
"error.expected.time" -> Singular("Time value expected"),
"error.expected.jodadate.format" -> Singular("Joda date value expected"),
"error.expected.jodatime.format" -> Singular("Joda time value expected"),
"error.expected.jsarray" -> Singular("Array value expected"),
"error.expected.jsboolean" -> Singular("Boolean value expected"),
"error.expected.jsnumber" -> Singular("Number value expected"),
"error.expected.jsobject" -> Singular("Object value expected"),
"error.expected.jsstring" -> Singular("String value expected"),
"error.expected.jsnumberorjsstring" -> Singular("String or number expected"),
"error.expected.keypathnode" -> Singular("Node value expected"),
"error.expected.uuid" -> Singular("UUID value expected"),
"error.expected.validenumvalue" -> Singular("Valid enumeration value expected"),
"error.expected.enumstring" -> Singular("String value expected"),
"error.path.empty" -> Singular("Empty path"),
"error.path.missing" -> Singular("Missing path"),
"error.path.result.multiple" -> Singular("Multiple results for the given path")
"constraint.required" -> Literal("Required"),
"constraint.min" -> Literal("Minimum value: {0}"),
"constraint.max" -> Literal("Maximum value: {0}"),
"constraint.minLength" -> Literal("Minimum length: {0}"),
"constraint.maxLength" -> Literal("Maximum length: {0}"),
"constraint.email" -> Literal("Email"),
"format.date" -> Literal("Date (''{0}'')"),
"format.numeric" -> Literal("Numeric"),
"format.real" -> Literal("Real"),
"format.uuid" -> Literal("UUID"),
"error.invalid" -> Literal("Invalid value"),
"error.invalid.java.util.Date" -> Literal("Invalid date value"),
"error.required" -> Literal("This field is required"),
"error.number" -> Literal("Numeric value expected"),
"error.real" -> Literal("Real number value expected"),
"error.real.precision" -> Literal("Real number value with no more than {0} digit(s) including {1} decimal(s) expected"),
"error.min" -> Literal("Must be greater or equal to {0}"),
"error.min.strict" -> Literal("Must be strictly greater than {0}"),
"error.max" -> Literal("Must be less or equal to {0}"),
"error.max.strict" -> Literal("Must be strictly less than {0}"),
"error.minLength" -> Literal("Minimum length is {0}"),
"error.maxLength" -> Literal("Maximum length is {0}"),
"error.email" -> Literal("Valid email required"),
"error.pattern" -> Literal("Must satisfy {0}"),
"error.date" -> Literal("Valid date required"),
"error.uuid" -> Literal("Valid UUID required"),
"error.expected.date" -> Literal("Date value expected"),
"error.expected.date.isoformat" -> Literal("Iso date value expected"),
"error.expected.time" -> Literal("Time value expected"),
"error.expected.jodadate.format" -> Literal("Joda date value expected"),
"error.expected.jodatime.format" -> Literal("Joda time value expected"),
"error.expected.jsarray" -> Literal("Array value expected"),
"error.expected.jsboolean" -> Literal("Boolean value expected"),
"error.expected.jsnumber" -> Literal("Number value expected"),
"error.expected.jsobject" -> Literal("Object value expected"),
"error.expected.jsstring" -> Literal("String value expected"),
"error.expected.jsnumberorjsstring" -> Literal("String or number expected"),
"error.expected.keypathnode" -> Literal("Node value expected"),
"error.expected.uuid" -> Literal("UUID value expected"),
"error.expected.validenumvalue" -> Literal("Valid enumeration value expected"),
"error.expected.enumstring" -> Literal("String value expected"),
"error.path.empty" -> Literal("Empty path"),
"error.path.missing" -> Literal("Missing path"),
"error.path.result.multiple" -> Literal("Multiple results for the given path")
)
}

2
modules/i18n/src/main/Translator.scala
View file

@ -9,7 +9,7 @@ sealed trait Translation extends Any {
def format(args: Seq[Any]): Option[String]
}
case class Singular(message: String) extends AnyVal with Translation {
case class Literal(message: String) extends AnyVal with Translation {
def format(args: Seq[Any]) = Some {
if (args.isEmpty) message

2
project/MessageCompiler.scala
View file

@ -55,7 +55,7 @@ object Registry {
val xml = XML.loadFile(file)
def quote(msg: String) = s"""""\"$msg""\""""
val content = xml.child.collect {
case e if e.label == "string" => s"""${toKey(e)}->Singular(\"\"\"${e.text}\"\"\")"""
case e if e.label == "string" => s"""${toKey(e)}->Literal(\"\"\"${e.text}\"\"\")"""
case e if e.label == "plurals" =>
val items = e.child.filter(_.label == "item").map { i =>
s"""${ucfirst(i.\("@quantity").toString)}->\"\"\"${i.text}\"\"\""""