@@ -109,17 +109,7 @@ protected function _toHtml()
109
109
);
110
110
111
111
$ this ->assignFieldsValues ($ localeData );
112
-
113
- // get "am" & "pm" words
114
- // AmPmMarkers and AmPmMarkersAbbr aren't guaranteed to exist, so fallback to null if neither exist
115
- $ amWord = $ localeData ['calendar ' ]['gregorian ' ]['AmPmMarkers ' ][0 ] ??
116
- $ localeData ['calendar ' ]['gregorian ' ]['AmPmMarkersAbbr ' ][0 ] ??
117
- null ;
118
- $ pmWord = $ localeData ['calendar ' ]['gregorian ' ]['AmPmMarkers ' ][1 ] ??
119
- $ localeData ['calendar ' ]['gregorian ' ]['AmPmMarkersAbbr ' ][1 ] ??
120
- null ;
121
- $ this ->assign ('am ' , $ this ->encoder ->encode ($ amWord ));
122
- $ this ->assign ('pm ' , $ this ->encoder ->encode ($ pmWord ));
112
+ $ this ->assignAmPmWords ($ localeData );
123
113
124
114
// get first day of week and weekend days
125
115
$ this ->assign (
@@ -216,4 +206,23 @@ private function assignFieldsValues(\ResourceBundle $localeData): void
216
206
$ this ->assign ('week ' , $ this ->encoder ->encode ($ localeData ['fields ' ]['week ' ]['dn ' ]));
217
207
}
218
208
}
209
+
210
+ /**
211
+ * Assign "am" & "pm" words from the ICU data
212
+ *
213
+ * @param \ResourceBundle $localeData
214
+ */
215
+ private function assignAmPmWords (\ResourceBundle $ localeData ): void
216
+ {
217
+ // AmPmMarkers and AmPmMarkersAbbr aren't guaranteed to exist, so fallback to null if neither exist
218
+ $ amWord = $ localeData ['calendar ' ]['gregorian ' ]['AmPmMarkers ' ][0 ] ??
219
+ $ localeData ['calendar ' ]['gregorian ' ]['AmPmMarkersAbbr ' ][0 ] ??
220
+ null ;
221
+ $ pmWord = $ localeData ['calendar ' ]['gregorian ' ]['AmPmMarkers ' ][1 ] ??
222
+ $ localeData ['calendar ' ]['gregorian ' ]['AmPmMarkersAbbr ' ][1 ] ??
223
+ null ;
224
+
225
+ $ this ->assign ('am ' , $ this ->encoder ->encode ($ amWord ));
226
+ $ this ->assign ('pm ' , $ this ->encoder ->encode ($ pmWord ));
227
+ }
219
228
}
0 commit comments