widelands

Merge lp:~widelands-dev/widelands/filesystem_translator_comments_codecheck into lp:widelands

  1. filesystem_translator_comments_codecheck
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8729
Proposed branch: lp:~widelands-dev/widelands/filesystem_translator_comments_codecheck
Merge into: lp:widelands
Diff against target: 34 lines (+5/-5)
1 file modified
src/io/filesystem/filesystem.cc (+5/-5)
To merge this branch: bzr merge lp:~widelands-dev/widelands/filesystem_translator_comments_codecheck
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+347462@code.launchpad.net

Commit message

Fix translators comments in filesystem.

Description of the change

clang-format stole our translators comments - this should make the codecheck go green.

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3587. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/388378457.
Appveyor build 3390. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_filesystem_translator_comments_codecheck-3390.

Revision history for this message
GunChleoc (gunchleoc) wrote :

We will want this ASAP when it goes green

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3590. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/388755406.
Appveyor build 3393. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_filesystem_translator_comments_codecheck-3393.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/io/filesystem/filesystem.cc'
2--- src/io/filesystem/filesystem.cc 2018-06-01 08:50:29 +0000
3+++ src/io/filesystem/filesystem.cc 2018-06-06 12:09:25 +0000
4@@ -199,25 +199,25 @@
5 starting_characters.push_back(character);
6 }
7 }
8- /** TRANSLATORS: Tooltip entry for characters in illegal filenames. %s is a list of illegal
9- * characters */
10 const std::string illegal_start(as_listitem(
11+ /** TRANSLATORS: Tooltip entry for characters in illegal filenames. %s is a list of illegal
12+ * characters */
13 (boost::format(pgettext("illegal_filename_characters", "%s at the start of the filename")) %
14 richtext_escape(i18n::localize_list(starting_characters, i18n::ConcatenateWith::OR)))
15 .str(),
16 UI_FONT_SIZE_MESSAGE));
17
18- /** TRANSLATORS: Tooltip entry for characters in illegal filenames. %s is a list of illegal
19- * characters */
20 const std::string illegal(as_listitem(
21+ /** TRANSLATORS: Tooltip entry for characters in illegal filenames. %s is a list of illegal
22+ * characters */
23 (boost::format(pgettext("illegal_filename_characters", "%s anywhere in the filename")) %
24 richtext_escape(i18n::localize_list(illegal_filename_characters, i18n::ConcatenateWith::OR)))
25 .str(),
26 UI_FONT_SIZE_MESSAGE));
27
28+ return (boost::format("%s%s%s") %
29 /** TRANSLATORS: Tooltip header for characters in illegal filenames. This is followed by a list
30 * of bullet points */
31- return (boost::format("%s%s%s") %
32 pgettext("illegal_filename_characters", "The following characters are not allowed:") %
33 illegal_start % illegal)
34 .str();

Subscribers

People subscribed via source and target branches

to status/vote changes: