Skip to content

Commit

Permalink
MM-20169 Fix incorrect escaping of translation strings (mattermost#4809)
Browse files Browse the repository at this point in the history
  • Loading branch information
hmhealey authored Feb 4, 2020
1 parent c85333e commit 20f24f8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion components/help/components/formatting.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export default function HelpFormatting(): JSX.Element {
</p>
<FormattedMessage
id='help.formatting.syntaxEx'
defaultMessage={'```go\npackage main\nimport "fmt"\nfunc main() \\{\n fmt.Println("Hello, 世界")\n\\}\n```'}
defaultMessage={'```go\npackage main\nimport "fmt"\nfunc main() {\n fmt.Println("Hello, 世界")\n}\n```'}
values={{dummy: ''}}
>
{(example) => renderRawExample(example)}
Expand Down
2 changes: 1 addition & 1 deletion components/message_submit_error.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class MessageSubmitError extends React.PureComponent<MessageSubmitErrorProps, {}
<React.Fragment>
<FormattedMessage
id='message_submit_error.invalidCommand'
defaultMessage={'Command with a trigger of \'{command}\' not found. '}
defaultMessage="Command with a trigger of ''{command}'' not found. "
values={{
command,
}}
Expand Down
4 changes: 2 additions & 2 deletions i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2492,7 +2492,7 @@
"help.formatting.supportedSyntax": "Supported languages are: `as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `fortran`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `styl`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
"help.formatting.syntax.description": "To add syntax highlighting, type the language to be highlighted after the ``` at the beginning of the code block. Mattermost also offers four different code themes (GitHub, Solarized Dark, Solarized Light, Monokai) that can be changed in **Account Settings** > **Display** > **Theme** > **Custom Theme** > **Center Channel Styles**",
"help.formatting.syntax.title": "Syntax Highlighting",
"help.formatting.syntaxEx": "```go\npackage main\nimport \"fmt\"\nfunc main() \\{\n fmt.Println(\"Hello, 世界\")\n\\}\n```",
"help.formatting.syntaxEx": "```goAA\npackage main\nimport \"fmt\"\nfunc main() {\n fmt.Println(\"Hello, 世界\")\n}\n```",
"help.formatting.tableExample": "| Left-Aligned | Center Aligned | Right Aligned |\n| :------------ |:---------------:| -----:|\n| Left column 1 | this text | $100 |\n| Left column 2 | is | $10 |\n| Left column 3 | centered | $1 |",
"help.formatting.tables.description": "Create a table by placing a dashed line under the header row and separating the columns with a pipe `|`. (The columns don't need to line up exactly for it to work). Choose how to align table columns by including colons `:` within the header row.",
"help.formatting.tables.title": "Tables",
Expand Down Expand Up @@ -2793,7 +2793,7 @@
"members_popover.manageMembers": "Manage Members",
"members_popover.title": "Channel Members",
"members_popover.viewMembers": "View Members",
"message_submit_error.invalidCommand": "Command with a trigger of '{command}' not found. ",
"message_submit_error.invalidCommand": "Command with a trigger of ''{command}'' not found. ",
"message_submit_error.sendAsMessageLink": "Click here to send as a message.",
"mfa.confirm.complete": "**Set up complete!**",
"mfa.confirm.okay": "Okay",
Expand Down

0 comments on commit 20f24f8

Please sign in to comment.