openshot.code team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 589
fixes bugs: https://launchpad.net/bugs/862487 https://launchpad.net/bugs/862490 https://launchpad.net/bugs/862507
committer: Jonathan Thomas <Jonathan.Oomph@xxxxxxxxx>
branch nick: openshot
timestamp: Thu 2011-09-29 11:04:35 -0500
message:
  1) Bumped version to 1.4.1~alpha1
  2) Fixed a few translation related issues, including error messages that did not correctly initialize the gettext code, and a seg fault caused by non-UTF-8 languages combined with gettext.
modified:
  openshot/classes/files.py
  openshot/classes/info.py
  openshot/language/Language_Init.py
  openshot/windows/MainGTK.py


--
lp:openshot
https://code.launchpad.net/~openshot.code/openshot/main

Your team OpenShot Code is subscribed to branch lp:openshot.
To unsubscribe from this branch go to https://code.launchpad.net/~openshot.code/openshot/main/+edit-subscription

=== modified file 'openshot/classes/files.py'
--- openshot/classes/files.py	2011-09-22 19:59:16 +0000
+++ openshot/classes/files.py	2011-09-29 16:04:35 +0000
@@ -408,7 +408,7 @@
 
 		# check if this file is already in the project
 		for item in self.items:
-			if not is_part and item.file_type == _("Image Sequence").lower():
+			if not is_part and item.file_type == "image sequence":
 				(itemBase, itemExt) = os.path.split(item.name)
 				if new_folder_path == itemBase:
 					return True

=== modified file 'openshot/classes/info.py'
--- openshot/classes/info.py	2011-09-23 05:09:23 +0000
+++ openshot/classes/info.py	2011-09-29 16:04:35 +0000
@@ -16,7 +16,7 @@
 #	You should have received a copy of the GNU General Public License
 #	along with OpenShot Video Editor.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION             = "1.4.0"
+VERSION             = "1.4.1~alpha1"
 DATE                = "20110921000000"
 NAME                = 'openshot'
 GPL_VERSION         = '3'

=== modified file 'openshot/language/Language_Init.py'
--- openshot/language/Language_Init.py	2011-07-16 15:51:05 +0000
+++ openshot/language/Language_Init.py	2011-09-29 16:04:35 +0000
@@ -72,7 +72,6 @@
 		
 		# Setup foreign language support
 		langs = []
-		#lc, encoding = locale.getdefaultlocale()
 		lc, encoding = locale.getlocale(locale.LC_MESSAGES)
 
 		if (lc):
@@ -80,15 +79,17 @@
 		language = os.environ.get('LANGUAGE', None)
 		if (language):
 			langs += language.split(":")
-		# Add languages... for testing
-		#langs += ["es", "fr"]
+
+		# Set locale specific settings
 		locale.setlocale(locale.LC_ALL)
 		locale.setlocale(locale.LC_NUMERIC, 'POSIX')
 		locale.bindtextdomain("OpenShot", self.project.LOCALE_DIR)
-		
+		locale.bind_textdomain_codeset("OpenShot", "UTF-8")
+
+		# Set gettext settings
+		gettext.bindtextdomain("OpenShot", self.project.LOCALE_DIR)
+		gettext.bind_textdomain_codeset("OpenShot", "UTF-8")
 		gettext.textdomain("OpenShot")
-		gettext.bindtextdomain("OpenShot", self.project.LOCALE_DIR)
-		
 		gettext.install(domain="OpenShot")
 
 		# This reference is used by other classes to define the _ method 

=== modified file 'openshot/windows/MainGTK.py'
--- openshot/windows/MainGTK.py	2011-09-21 20:53:57 +0000
+++ openshot/windows/MainGTK.py	2011-09-29 16:04:35 +0000
@@ -1821,6 +1821,9 @@
 	def on_tlbMakeMovie_clicked(self, widget, *args):
 		print "on_tlbMakeMovie_clicked called with self.%s" % widget.get_name()
 		
+		# get translation object
+		_ = self._
+		
 		for track in self.project.sequences[0].tracks:
 			# Loop through all clips on this track
 			if len(track.clips) == 0:
@@ -2480,6 +2483,9 @@
 
 	def on_drag_data_received(self, widget, context, x, y, selection, target_type, timestamp):
 
+		# get correct gettext method
+		_ = self._
+
 		# close the AddFile dialog (if it's still open)
 		if self.import_files_dialog:
 			self.import_files_dialog.frmAddFiles.destroy()