diff --git a/app/resources/locales/en_US/field.po b/app/resources/locales/en_US/field.po index 4ecc006a2..bb2b38ddd 100644 --- a/app/resources/locales/en_US/field.po +++ b/app/resources/locales/en_US/field.po @@ -38,6 +38,9 @@ msgstr "API Key" msgid "affiliation" msgstr "Affiliation" +msgid "am" +msgstr "AM" + msgid "area_code" msgstr "Area Code" @@ -123,6 +126,9 @@ msgstr "Honorific" msgid "honorific.desc" msgstr "(Dr, Hon, etc)" +msgid "hour" +msgstr "Hour" + msgid "identifier" msgstr "Identifier" @@ -147,6 +153,9 @@ msgstr "Manager" msgid "middle" msgstr "Middle" +msgid "minute" +msgstr "Minute" + msgid "name" msgstr "Name" @@ -173,6 +182,9 @@ msgstr "Parent" msgid "postal_code" msgstr "Postal Code" +msgid "pm" +msgstr "PM" + msgid "primary_name" msgstr "Primary Name" diff --git a/app/src/View/Helper/FieldHelper.php b/app/src/View/Helper/FieldHelper.php index e6d3b7cd7..8e401fcff 100644 --- a/app/src/View/Helper/FieldHelper.php +++ b/app/src/View/Helper/FieldHelper.php @@ -131,8 +131,12 @@ public function control(string $fieldName, dateTime: "' . $pickerDateTime .'", timed: true, ampm: false, - core: {}, - txt: {} + txt: { + hour: "' . __d('field', 'hour') . '", + minute: "' . __d('field', 'minute') . '", + am: "' . __d('field', 'am') . '", + pm: "' . __d('field', 'pm') . '" + } } }, components: { @@ -146,7 +150,8 @@ public function control(string $fieldName, :target="target" :date="date" :timed="timed" - :ampm="ampm"> + :ampm="ampm" + :txt="txt"> '; diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index dfb69ca87..4bf618e90 100644 --- a/app/webroot/css/co-base.css +++ b/app/webroot/css/co-base.css @@ -1118,6 +1118,7 @@ ul.fields li.fields-datepicker .field-info { .cm-time-picker-title { padding: 0.25em; border-bottom: 1px solid var(--cmg-color-lightgray-005); + font-size: 1.1em; } .cm-time-picker-vals ul { display: grid; diff --git a/app/webroot/js/comanage/components/datepicker/cm-datetimepicker.js b/app/webroot/js/comanage/components/datepicker/cm-datetimepicker.js index bdf608d2e..cb8cc4041 100644 --- a/app/webroot/js/comanage/components/datepicker/cm-datetimepicker.js +++ b/app/webroot/js/comanage/components/datepicker/cm-datetimepicker.js @@ -31,7 +31,8 @@ export default { date: String, dateTime: String, timed: Boolean, - ampm: Boolean + ampm: Boolean, + txt: Object }, components: { CmTimePicker @@ -161,7 +162,8 @@ export default { @set-time="setFieldTime" :target="this.target" :datetime="this.dateTime" - :ampm="this.ampm"> + :ampm="this.ampm" + :txt="this.txt"> diff --git a/app/webroot/js/comanage/components/datepicker/cm-timepicker.js b/app/webroot/js/comanage/components/datepicker/cm-timepicker.js index 9d6897929..3ecf36dda 100644 --- a/app/webroot/js/comanage/components/datepicker/cm-timepicker.js +++ b/app/webroot/js/comanage/components/datepicker/cm-timepicker.js @@ -27,7 +27,8 @@ export default { props: { target: String, datetime: String, - ampm: Boolean + ampm: Boolean, + txt: Object }, data() { return { @@ -42,7 +43,7 @@ export default { template: `
-
Hour
+
{{ txt.hour }}
  • @@ -53,7 +54,7 @@ export default {
:
-
Minute
+
{{ txt.minute }}