Merge pull request #39 from mprevel/I18N_no_varargs

I18N multiple substitutions support

Author: lucidd

bindings/src/main/scala/chrome/i18n/I18N.scala

@@ -4,6 +4,9 @@ import scala.concurrent.{Future, Promise}
 import scala.scalajs.js
 import chrome.utils.ErrorHandling._
 
+import js.JSConverters._
+import scala.scalajs.js.|
+
 object I18N {
 
   def getAcceptLanguages: Future[js.Array[String]] = {
@@ -14,9 +17,14 @@ object I18N {
     promise.future
   }
 
-  def getMessage(messageName: String,
-                 substitutions: String*): js.UndefOr[String] =
-    bindings.I18N.getMessage(messageName, substitutions: _*)
+  def getMessage(messageName: String, substitutions: String*): js.UndefOr[String] = {
+    if(substitutions.isEmpty) {
+      bindings.I18N.getMessage(messageName)
+    } else {
+      val jsArraySubstitutions = substitutions.toJSArray.asInstanceOf[String | js.Array[String]]
+      bindings.I18N.getMessage(messageName, Some(jsArraySubstitutions).orUndefined)
+    }
+  }
 
   def getUILanguage: String = bindings.I18N.getUILanguage()
 

bindings/src/main/scala/chrome/i18n/bindings/I18N.scala

@@ -2,6 +2,7 @@ package chrome.i18n.bindings
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSGlobal
+import scala.scalajs.js.|
 
 @js.native
 @JSGlobal("chrome.i18n")
@@ -11,7 +12,7 @@ object I18N extends js.Object {
     js.native
 
   def getMessage(messageName: String,
-                 substitutions: String*): js.UndefOr[String] = js.native
+                 substitutions: js.UndefOr[String | js.Array[String]] = js.undefined): js.UndefOr[String] = js.native
 
   def getUILanguage(): String = js.native