Fix compatibility with 5.0 RC

youknowriad · Nov 23, 2018 · c003845 · c003845
1 parent c73669a
commit c003845
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/scripts/fields/fields/date.js b/scripts/fields/fields/date.js
@@ -1,5 +1,4 @@
 import { DatePicker } from "@wordpress/components";
-import { getSettings } from "@wordpress/date";
 import { __ } from "@wordpress/i18n";
 import { createElement } from "@wordpress/element";
 
@@ -9,16 +8,9 @@ const dateField = {
   name: "date",
   label: __("Date", "gutenberg-custom-fields"),
   editForm: fieldConfig => ({ value, onChange }) => {
-    const settings = getSettings();
     return (
       <Field label={fieldConfig.title || fieldConfig.name}>
-        {() => (
-          <DatePicker
-            locale={settings.l10n.locale}
-            currentDate={value}
-            onChange={onChange}
-          />
-        )}
+        {() => <DatePicker currentDate={value} onChange={onChange} />}
       </Field>
     );
   }

diff --git a/scripts/fields/fields/datetime.js b/scripts/fields/fields/datetime.js
@@ -1,13 +1,13 @@
 import { DateTimePicker } from "@wordpress/components";
-import { getSettings } from "@wordpress/date";
+import { __experimentalGetSettings } from "@wordpress/date";
 import { __ } from "@wordpress/i18n";
 import { createElement } from "@wordpress/element";
 
 import Field from "../components/field";
 
 // To know if the current timezone is a 12 hour time with look for "a" in the time format
 // We also make sure this a is not escaped by a "/"
-const settings = getSettings();
+const settings = __experimentalGetSettings();
 const is12HourTime = /a(?!\\)/i.test(
   settings.formats.time
     .toLowerCase() // Test only the lower case a
@@ -25,7 +25,6 @@ const datetimeField = {
       <Field label={fieldConfig.title || fieldConfig.name}>
         {() => (
           <DateTimePicker
-            locale={settings.l10n.locale}
             currentDate={value}
             is12HourTime={is12HourTime}
             onChange={onChange}

diff --git a/scripts/fields/fields/time.js b/scripts/fields/fields/time.js
@@ -1,13 +1,13 @@
 import { TimePicker } from "@wordpress/components";
-import { getSettings } from "@wordpress/date";
+import { __experimentalGetSettings } from "@wordpress/date";
 import { __ } from "@wordpress/i18n";
 import { createElement } from "@wordpress/element";
 
 import Field from "../components/field";
 
 // To know if the current timezone is a 12 hour time with look for "a" in the time format
 // We also make sure this a is not escaped by a "/"
-const settings = getSettings();
+const settings = __experimentalGetSettings();
 const is12HourTime = /a(?!\\)/i.test(
   settings.formats.time
     .toLowerCase() // Test only the lower case a
@@ -25,7 +25,6 @@ const timeField = {
       <Field label={fieldConfig.title || fieldConfig.name}>
         {() => (
           <TimePicker
-            locale={settings.l10n.locale}
             currentTime={value}
             is12HourTime={is12HourTime}
             onChange={onChange}