widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

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

Commit message:
Improved error messages for gl initialize.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
  https://bugs.launchpad.net/widelands/+bug/1421942
  Bug #1487887 in widelands: "Translation missing in editor and in replay tooltip"
  https://bugs.launchpad.net/widelands/+bug/1487887
  Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the battle ax"
  https://bugs.launchpad.net/widelands/+bug/1530240
  Bug #1530398 in widelands: "Wrong text above marble mine"
  https://bugs.launchpad.net/widelands/+bug/1530398
  Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
  https://bugs.launchpad.net/widelands/+bug/1547909

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379

The error message for the shading language version is a bit misleading, so I did some rework. Also, the dialog box was too wide for my taste.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-fixes into lp:widelands.

=== modified file 'src/graphic/gl/initialize.cc'
--- src/graphic/gl/initialize.cc	2018-10-09 20:18:52 +0000
+++ src/graphic/gl/initialize.cc	2018-10-10 07:05:34 +0000
@@ -185,9 +185,7 @@
 	if (strcmp(shading_language_version_string, "(null)") == 0) {
 		log("ERROR: Unable to detect the shading language version!\n");
 		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error",
-		                         "Widelands won’t work because we were unable to detect the shading "
-		                         "language version -- there is an unknown problem with reading the "
-		                         "information from the graphics driver.",
+		                         "Widelands won't work because we were unable to detect the shading language version.\nThere is an unknown problem with reading the information from the graphics driver.",
 		                         NULL);
 		exit(1);
 	}
@@ -199,8 +197,7 @@
 	if (shading_language_version < 1.20) {
 		log("ERROR: Shading language version is too old!\n");
 		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error",
-		                         "Widelands won’t work because your graphics driver is too old -- "
-		                         "version 1.20 or newer is required.",
+		                         "Widelands won’t work because your graphics driver is too old.\nThe Shading language needs to be version 1.20 or newer.",
 		                         NULL);
 		exit(1);
 	}