Address PR comments

Author: alex35mil

examples/Page.re

@@ -1,3 +1,4 @@
+open ReactIntl;
 open PageLocale;
 
 [@react.component]
@@ -17,19 +18,19 @@ let make = (~locale, ~setLocale) => {
       </button>
     </div>
     <div className="message">
-      <ReactIntl.FormattedMessage id="page.hello" defaultMessage="Hello" />
+      <FormattedMessage id="page.hello" defaultMessage="Hello" />
       " "->React.string
-      <ReactIntl.FormattedMessage id="page.world" defaultMessage="World" />
+      <FormattedMessage id="page.world" defaultMessage="World" />
     </div>
     <div>
-      ReactIntl.(intl->Intl.formatMessage(pageLocale##today)->React.string)
+      {intl->Intl.formatMessage(pageLocale##today)->React.string}
       " "->React.string
-      ReactIntl.(intl->Intl.formatDate(Js.Date.make())->React.string)
+      {intl->Intl.formatDate(Js.Date.make())->React.string}
       " (intl.formatDate)"->React.string
       <br />
-      ReactIntl.(intl->Intl.formatMessage(pageLocale##today)->React.string)
+      {intl->Intl.formatMessage(pageLocale##today)->React.string}
       " "->React.string
-      <ReactIntl.FormattedDate value={Js.Date.make()} />
+      <FormattedDate value={Js.Date.make()} />
       " (FormattedDate)"->React.string
     </div>
   </div>;

examples/Util.re

@@ -1,20 +1,14 @@
-let wrapUnicodeString = (input: string) => {j|$input|j};
-
-let wrapOptUnicodeString = (input: Js.nullable(string)) =>
-  switch (input->Js.Nullable.toOption) {
-  | Some(input) => input->wrapUnicodeString
-  | None => ""
-  };
-
 let translationsToDict = (translations: array(ReactIntl.translation)) => {
   translations->Belt.Array.reduce(
     Js.Dict.empty(),
-    (dict, message) => {
-      let unicodeMessage = message##message->wrapOptUnicodeString;
-      let unicodeDefaultMessage = message##defaultMessage->wrapUnicodeString;
+    (dict, entry) => {
       dict->Js.Dict.set(
-        message##id,
-        unicodeMessage !== "" ? unicodeMessage : unicodeDefaultMessage,
+        entry##id,
+        switch (entry##message->Js.Nullable.toOption) {
+        | None
+        | Some("") => entry##defaultMessage
+        | Some(message) => message
+        },
       );
       dict;
     },