Unicode support in format strings #5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This change fixes an issue where the Datetime Format GUI fails to load with the error 'Failed to convert locale string to UTF8: Invalid byte sequence in conversion input' if unicode characters are entered in any of the format strings. Date().toLocaleFormat(format) only accepts ascii characters in the format string. This change works around that limitation by escaping non-ascii characters in the format string before passing the string to toLocaleFormat(), then escaping the result in case non-ascii characters are in the localized string, and finally unescaping the resulting string by passing it to JSON.parse.
Daniel-Khodabakhsh
requested changes
Jan 8, 2018
src/Utilities.js
Outdated
| @@ -12,7 +12,13 @@ const Gtk = imports.gi.Gtk; | |||
| /// @return {string} Datetime representation of format, or format if the conversion fails, or datetime representation of defaultFormat, or blank. | |||
| /// | |||
| function dateTimeFormat(format, defaultFormat) { | |||
| return (format && new Date().toLocaleFormat(format) || format) || defaultFormat && new Date().toLocaleFormat(defaultFormat) || ""; | |||
| function escapeUnicode(str) { | |||
There was a problem hiding this comment.
Can you move this function out and add comments like the other functions in this file? And could you also rename the 'str' parameter to 'string'?
src/Utilities.js
Outdated
| }); | ||
| } | ||
|
|
||
| return JSON.parse('"' + escapeUnicode((format && new Date().toLocaleFormat(escapeUnicode(format)) || format) || defaultFormat && new Date().toLocaleFormat(escapeUnicode(defaultFormat)) || "").replace('"', '\\"') + '"'); |
There was a problem hiding this comment.
Just wanted to test this before I merge it, want to make sure all edge cases are accounted for.
|
Thanks Daniel. I did some edge case testing just now on this and found this doesn't handle " and \ characters well, need to escape them to make JSON.parse happy. I will push an update today with these fixes and your requested changes. |
This change expands on the previous unicode fix to also escape \ and " characters that are problematic for JSON.parse, and make formatting changes. escapeJson() includes escaping problematic ascii characters and unicode, while escapeUnicode() escapes only unicode characters. escapeJson() should be run only once on the raw format string to avoid over-escaping, and the escapeUnicode() must be run after toLocaleFormat() because toLocaleFormat() can return additional unicode characters in languages like Japanese.
|
Just pushed an update that addresses your feedback and fixes the " and \ issues. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change fixes an issue where the Datetime Format GUI fails to load with the error 'Failed to convert locale string to UTF8: Invalid byte sequence in conversion input' if unicode characters are entered in any of the format strings.
Date().toLocaleFormat(format) only accepts ascii characters in the format string. This change works around that limitation by escaping non-ascii characters in the format string before passing the string to toLocaleFormat(), then escaping the result in case non-ascii characters are in the localized string, and finally unescaping the resulting string by passing it to JSON.parse.