Merge pull request #123 from mvdstam/develop

adrianhurt · web-flow · commit 9cda1af1b309 · 2019-07-23T20:14:23.000+02:00
Removed superfluous translation calls
diff --git a/play26-bootstrap3/module/app/views/b3/radioWithOptions.scala.html b/play26-bootstrap3/module/app/views/b3/radioWithOptions.scala.html
@@ -1,6 +1,6 @@
 @(field: Field, options: Seq[(String, Any)], args: (Symbol, Any)*)(implicit fc: b3.B3FieldConstructor, messages: MessagesProvider)
 @radioWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> options.headOption.map(_._1)):_*) { implicit extraInfo =>
 	@options.map { v =>
-		@radioOption(v._1, bs.Args.msg(v._2)(messages))
+		@radioOption(v._1, v._2)
 	}
-}(fc, messages)
+}(fc, messages)
diff --git a/play26-bootstrap3/module/app/views/b3/selectWithContent.scala.html b/play26-bootstrap3/module/app/views/b3/selectWithContent.scala.html
@@ -24,12 +24,12 @@
 				@readonlyWrapper(selectName, fieldInfo.value, disabled, argsMap) {
 					<select id="@fieldInfo.id" name="@selectName" @toHtmlArgs(fieldInfo.innerArgsMap)>
 						@argsMap.get('_default).map { v =>
-							@selectOption("", bs.Args.msg(v)(messages), 'class -> "blank", 'selected -> true, 'disabled -> "disabled")
+							@selectOption("", v, 'class -> "blank", 'selected -> true, 'disabled -> "disabled")
 						}
 						@content(values)
 					</select>
 				}
 			}
 		}
 	}(fc, messages)
-}
+}
diff --git a/play26-bootstrap3/module/app/views/b3/selectWithOptions.scala.html b/play26-bootstrap3/module/app/views/b3/selectWithOptions.scala.html
@@ -1,6 +1,6 @@
 @(field: Field, options: Seq[(String,String)], args: (Symbol,Any)*)(implicit fc: b3.B3FieldConstructor, messages: MessagesProvider)
-@selectWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> bs.Args.get(args, '_default).map(bs.Args.msg(_)(messages)).orElse(options.headOption.map(_._1))):_*) { implicit values =>
+@selectWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> bs.Args.get(args, '_default).orElse(options.headOption.map(_._1))):_*) { implicit values =>
 	@options.map { v =>
-		@selectOption(v._1, bs.Args.msg(v._2)(messages))
+		@selectOption(v._1, v._2)
 	}
-}(fc, messages)
+}(fc, messages)
diff --git a/play26-bootstrap4/module/app/views/b4/radioWithOptions.scala.html b/play26-bootstrap4/module/app/views/b4/radioWithOptions.scala.html
@@ -1,6 +1,6 @@
 @(field: Field, options: Seq[(String, Any)], args: (Symbol, Any)*)(implicit fc: b4.B4FieldConstructor, msgsProv: MessagesProvider)
 @radioWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> options.headOption.map(_._1)):_*) { implicit extraInfo =>
 	@options.map { v =>
-		@radioOption(v._1, bs.Args.msg(v._2)(msgsProv))
+		@radioOption(v._1, v._2)
 	}
-}(fc, msgsProv)
+}(fc, msgsProv)
diff --git a/play26-bootstrap4/module/app/views/b4/selectWithContent.scala.html b/play26-bootstrap4/module/app/views/b4/selectWithContent.scala.html
@@ -24,12 +24,12 @@
 				@readonlyWrapper(selectName, fieldInfo.value, disabled, argsMap) {
 					<select id="@fieldInfo.id" name="@selectName" @toHtmlArgs(bs.ArgsMap.withAddingStringValue(fieldInfo.innerArgsMap, 'class, if (fieldInfo.isCustom) "custom-select" else "form-control"))>
 						@argsMap.get('_default).map { v =>
-							@selectOption("", bs.Args.msg(v)(msgsProv), 'class -> "blank", 'selected -> true, 'disabled -> "disabled")
+							@selectOption("", v, 'class -> "blank", 'selected -> true, 'disabled -> "disabled")
 						}
 						@content(values)
 					</select>
 				}
 			}
 		}
 	}(fc, msgsProv)
-}
+}
diff --git a/play26-bootstrap4/module/app/views/b4/selectWithOptions.scala.html b/play26-bootstrap4/module/app/views/b4/selectWithOptions.scala.html
@@ -1,6 +1,6 @@
 @(field: Field, options: Seq[(String,String)], args: (Symbol,Any)*)(implicit fc: b4.B4FieldConstructor, msgsProv: MessagesProvider)
-@selectWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> bs.Args.get(args, '_default).map(bs.Args.msg(_)(msgsProv)).orElse(options.headOption.map(_._1))):_*) { implicit values =>
+@selectWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> bs.Args.get(args, '_default).orElse(options.headOption.map(_._1))):_*) { implicit values =>
 	@options.map { v =>
-		@selectOption(v._1, bs.Args.msg(v._2)(msgsProv))
+		@selectOption(v._1, v._2)
 	}
-}(fc, msgsProv)
+}(fc, msgsProv)
diff --git a/play27-bootstrap3/module/app/views/b3/radioWithOptions.scala.html b/play27-bootstrap3/module/app/views/b3/radioWithOptions.scala.html
@@ -1,6 +1,6 @@
 @(field: Field, options: Seq[(String, Any)], args: (Symbol, Any)*)(implicit fc: b3.B3FieldConstructor, messages: MessagesProvider)
 @radioWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> options.headOption.map(_._1)):_*) { implicit extraInfo =>
 	@options.map { v =>
-		@radioOption(v._1, bs.Args.msg(v._2)(messages))
+		@radioOption(v._1, v._2)
 	}
-}(fc, messages)
+}(fc, messages)
diff --git a/play27-bootstrap3/module/app/views/b3/selectWithContent.scala.html b/play27-bootstrap3/module/app/views/b3/selectWithContent.scala.html
@@ -24,12 +24,12 @@
 				@readonlyWrapper(selectName, fieldInfo.value, disabled, argsMap) {
 					<select id="@fieldInfo.id" name="@selectName" @toHtmlArgs(fieldInfo.innerArgsMap)>
 						@argsMap.get('_default).map { v =>
-							@selectOption("", bs.Args.msg(v)(messages), 'class -> "blank", 'selected -> true, 'disabled -> "disabled")
+							@selectOption("", v, 'class -> "blank", 'selected -> true, 'disabled -> "disabled")
 						}
 						@content(values)
 					</select>
 				}
 			}
 		}
 	}(fc, messages)
-}
+}
diff --git a/play27-bootstrap3/module/app/views/b3/selectWithOptions.scala.html b/play27-bootstrap3/module/app/views/b3/selectWithOptions.scala.html
@@ -1,6 +1,6 @@
 @(field: Field, options: Seq[(String,String)], args: (Symbol,Any)*)(implicit fc: b3.B3FieldConstructor, messages: MessagesProvider)
-@selectWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> bs.Args.get(args, '_default).map(bs.Args.msg(_)(messages)).orElse(options.headOption.map(_._1))):_*) { implicit values =>
+@selectWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> bs.Args.get(args, '_default).orElse(options.headOption.map(_._1))):_*) { implicit values =>
 	@options.map { v =>
-		@selectOption(v._1, bs.Args.msg(v._2)(messages))
+		@selectOption(v._1, v._2)
 	}
-}(fc, messages)
+}(fc, messages)
diff --git a/play27-bootstrap4/module/app/views/b4/radioWithOptions.scala.html b/play27-bootstrap4/module/app/views/b4/radioWithOptions.scala.html
@@ -1,6 +1,6 @@
 @(field: Field, options: Seq[(String, Any)], args: (Symbol, Any)*)(implicit fc: b4.B4FieldConstructor, msgsProv: MessagesProvider)
 @radioWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> options.headOption.map(_._1)):_*) { implicit extraInfo =>
 	@options.map { v =>
-		@radioOption(v._1, bs.Args.msg(v._2)(msgsProv))
+		@radioOption(v._1, v._2)
 	}
-}(fc, msgsProv)
+}(fc, msgsProv)
diff --git a/play27-bootstrap4/module/app/views/b4/selectWithContent.scala.html b/play27-bootstrap4/module/app/views/b4/selectWithContent.scala.html
@@ -24,12 +24,12 @@
 				@readonlyWrapper(selectName, fieldInfo.value, disabled, argsMap) {
 					<select id="@fieldInfo.id" name="@selectName" @toHtmlArgs(bs.ArgsMap.withAddingStringValue(fieldInfo.innerArgsMap, 'class, if (fieldInfo.isCustom) "custom-select" else "form-control"))>
 						@argsMap.get('_default).map { v =>
-							@selectOption("", bs.Args.msg(v)(msgsProv), 'class -> "blank", 'selected -> true, 'disabled -> "disabled")
+							@selectOption("", v, 'class -> "blank", 'selected -> true, 'disabled -> "disabled")
 						}
 						@content(values)
 					</select>
 				}
 			}
 		}
 	}(fc, msgsProv)
-}
+}
diff --git a/play27-bootstrap4/module/app/views/b4/selectWithOptions.scala.html b/play27-bootstrap4/module/app/views/b4/selectWithOptions.scala.html
@@ -1,6 +1,6 @@
 @(field: Field, options: Seq[(String,String)], args: (Symbol,Any)*)(implicit fc: b4.B4FieldConstructor, msgsProv: MessagesProvider)
-@selectWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> bs.Args.get(args, '_default).map(bs.Args.msg(_)(msgsProv)).orElse(options.headOption.map(_._1))):_*) { implicit values =>
+@selectWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> bs.Args.get(args, '_default).orElse(options.headOption.map(_._1))):_*) { implicit values =>
 	@options.map { v =>
-		@selectOption(v._1, bs.Args.msg(v._2)(msgsProv))
+		@selectOption(v._1, v._2)
 	}
-}(fc, msgsProv)
+}(fc, msgsProv)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`@(field: Field, options: Seq[(String, Any)], args: (Symbol, Any)*)(implicit fc: b3.B3FieldConstructor, messages: MessagesProvider)`
`2`	`2`	`@radioWithContent(field, bs.Args.withDefault(args, '_hiddenValue -> options.headOption.map(_._1)):_*) { implicit extraInfo =>`
`3`	`3`	`@options.map { v =>`
`4`		`- @radioOption(v._1, bs.Args.msg(v._2)(messages))`
	`4`	`+ @radioOption(v._1, v._2)`
`5`	`5`	`}`
`6`		`-}(fc, messages)`
	`6`	`+}(fc, messages)`
Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@`
`24`	`24`	`@readonlyWrapper(selectName, fieldInfo.value, disabled, argsMap) {`
`25`	`25`	`<select id="@fieldInfo.id" name="@selectName" @toHtmlArgs(fieldInfo.innerArgsMap)>`
`26`	`26`	`@argsMap.get('_default).map { v =>`
`27`		`- @selectOption("", bs.Args.msg(v)(messages), 'class -> "blank", 'selected -> true, 'disabled -> "disabled")`
	`27`	`+ @selectOption("", v, 'class -> "blank", 'selected -> true, 'disabled -> "disabled")`
`28`	`28`	`}`
`29`	`29`	`@content(values)`
`30`	`30`	`</select>`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`}(fc, messages)`
`35`		`-}`
	`35`	`+}`