Merge pull request #637 from carstingaxion/fix/632

Allow the date- and time-format strings to contain escaped characters

src/helpers/datetime.js

@@ -461,10 +461,16 @@ export function convertPHPToMomentFormat(format) {
 		r: '', // no equivalent
 		U: 'X',
 	};
-
 	return String(format)
 		.split('')
-		.map((chr) => (chr in replacements ? replacements[chr] : chr))
+		.map((chr, index, elements) => {
+			// Allow the format string to contain escaped chars, like ES or DE needs
+			const last = elements[index - 1];
+			if (chr in replacements && last !== '\\') {
+				return replacements[chr];
+			}
+			return chr;
+		})
 		.join('');
 }
 

test/unit/js/src/helpers/datetime.test.js

@@ -284,3 +284,9 @@ test('convertPHPToMomentFormat returns correct time format', () => {
 
 	expect(format).toBe('h:mm a');
 });
+
+test('convertPHPToMomentFormat returns correct format that contains escaped chars, like ES or DE needs', () => {
+	const format = convertPHPToMomentFormat('G:i \\U\\h\\r'); // "20 Uhr" is german for "8 o'clock" (in the evening).
+
+	expect(format).toBe('H:mm \\U\\h\\r');
+});