Sophie

Sophie

distrib > Mageia > 6 > armv5tl > by-pkgid > 5683333000820016d1e02cbea2dc2fe1 > files > 5

blender-2.79b-1.1.mga6.src.rpm

diff -urN blender-2.76/source/blender/blentranslation/intern/blt_lang.c blender-2.76-patched/source/blender/blentranslation/intern/blt_lang.c
--- blender-2.76/source/blender/blentranslation/intern/blt_lang.c	2015-10-10 10:20:56.000000000 +0200
+++ blender-2.76-patched/source/blender/blentranslation/intern/blt_lang.c	2015-10-12 21:54:49.914626783 +0200
@@ -86,7 +86,6 @@
 
 static void fill_locales(void)
 {
-	const char * const languages_path = BKE_appdir_folder_id(BLENDER_DATAFILES, "locale");
 	char languages[FILE_MAX];
 	LinkNode *lines = NULL, *line;
 	char *str;
@@ -94,8 +93,7 @@
 
 	free_locales();
 
-	BLI_join_dirfile(languages, FILE_MAX, languages_path, "languages");
-	line = lines = BLI_file_read_as_lines(languages);
+	line = lines = BLI_file_read_as_lines("/usr/share/blender/locale/languages");
 
 	/* This whole "parsing" code is a bit weak, in that it expects strictly formatted input file...
 	 * Should not be a problem, though, as this file is script-generated! */
@@ -194,7 +192,7 @@
 void BLT_lang_init(void)
 {
 #ifdef WITH_INTERNATIONAL
-	const char * const messagepath = BKE_appdir_folder_id(BLENDER_DATAFILES, "locale");
+	const char * const messagepath = "/usr/share/locale";
 #endif
 
 	/* Make sure LANG is correct and wouldn't cause std::rumtime_error. */
diff -urN blender-2.76/source/creator/CMakeLists.txt blender-2.76-patched/source/creator/CMakeLists.txt
--- blender-2.76/source/creator/CMakeLists.txt	2015-10-10 10:20:56.000000000 +0200
+++ blender-2.76-patched/source/creator/CMakeLists.txt	2015-10-12 21:56:51.019630930 +0200
@@ -345,7 +345,8 @@
 	)
 
 	set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
-	set(_locale_target_dir ${TARGETDIR_VER}/datafiles/locale)
+	set(_locale_target_dir "share/locale")
+	set(_languages_target_dir "share/blender/locale")
 
 	file(GLOB _po_files "${_locale_dir}/po/*.po")
 	foreach(_po_file ${_po_files})
@@ -362,7 +363,7 @@
 	# Generate INSTALL rules
 	install(
 		FILES ${_locale_dir}/languages
-		DESTINATION ${_locale_target_dir}
+		DESTINATION ${_languages_target_dir}
 	)
 
 	foreach(_mo_file ${_all_mo_files})