widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/filesystem_translator_comments_codecheck into lp:widelands.

Commit message:
Fix translators comments in filesystem.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/filesystem_translator_comments_codecheck/+merge/347462

clang-format stole our translators comments - this should make the codecheck go green.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/filesystem_translator_comments_codecheck into lp:widelands.

=== modified file 'src/io/filesystem/filesystem.cc'
--- src/io/filesystem/filesystem.cc	2018-06-01 08:50:29 +0000
+++ src/io/filesystem/filesystem.cc	2018-06-05 16:35:53 +0000
@@ -199,25 +199,25 @@
 			starting_characters.push_back(character);
 		}
 	}
-	/** TRANSLATORS: Tooltip entry for characters in illegal filenames. %s is a list of illegal
-	 * characters */
 	const std::string illegal_start(as_listitem(
-	   (boost::format(pgettext("illegal_filename_characters", "%s at the start of the filename")) %
+	/** TRANSLATORS: Tooltip entry for characters in illegal filenames. %s is a list of illegal
+	 * characters */
+s	   (boost::format(pgettext("illegal_filename_characters", "%s at the start of the filename")) %
 	    richtext_escape(i18n::localize_list(starting_characters, i18n::ConcatenateWith::OR)))
 	      .str(),
 	   UI_FONT_SIZE_MESSAGE));
 
-	/** TRANSLATORS: Tooltip entry for characters in illegal filenames. %s is a list of illegal
-	 * characters */
 	const std::string illegal(as_listitem(
+	/** TRANSLATORS: Tooltip entry for characters in illegal filenames. %s is a list of illegal
+	 * characters */
 	   (boost::format(pgettext("illegal_filename_characters", "%s anywhere in the filename")) %
 	    richtext_escape(i18n::localize_list(illegal_filename_characters, i18n::ConcatenateWith::OR)))
 	      .str(),
 	   UI_FONT_SIZE_MESSAGE));
 
+	return (boost::format("%s%s%s") %
 	/** TRANSLATORS: Tooltip header for characters in illegal filenames. This is followed by a list
 	 * of bullet points */
-	return (boost::format("%s%s%s") %
 	        pgettext("illegal_filename_characters", "The following characters are not allowed:") %
 	        illegal_start % illegal)
 	   .str();