--- openshot-1.3.0.orig/openshot/openshot.py
+++ openshot-1.3.0/openshot/openshot.py
@@ -20,6 +20,7 @@
import os, sys
import gtk, locale
from classes import info
+from language import Language_Init
# Ensure GTK minimum version is met (this is a new requirement needed
# for using GtkBuilder instead of Glade
@@ -51,6 +52,9 @@ def main():
# locale-aware number to string formatting
locale.setlocale(locale.LC_ALL, '')
+ # Add language support
+ translator = Language_Init.Translator()
+
# init threads - this helps support the
# multi-threaded architecture of mlt
gtk.gdk.threads_init()
--- openshot-1.3.0.orig/openshot/language/Language_Init.py
+++ openshot-1.3.0/openshot/language/Language_Init.py
@@ -66,9 +66,9 @@ class Translator:
"""Class that contains functions to initiate language translations"""
#----------------------------------------------------------------------
- def __init__(self, project):
+ def __init__(self):
"""Constructor"""
- self.project = project
+ localedir = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), "openshot", "locale")
# Setup foreign language support
langs = []
@@ -83,12 +83,9 @@ class Translator:
#langs += ["es", "fr"]
locale.setlocale(locale.LC_ALL)
locale.setlocale(locale.LC_NUMERIC, 'POSIX')
- locale.bindtextdomain("OpenShot", self.project.LOCALE_DIR)
+ locale.bindtextdomain("OpenShot", localedir)
- gettext.textdomain("OpenShot")
- gettext.bindtextdomain("OpenShot", self.project.LOCALE_DIR)
-
- gettext.install(domain="OpenShot")
+ gettext.install("OpenShot", localedir)
# This reference is used by other classes to define the _ method
- self.lang = gettext.translation("OpenShot", self.project.LOCALE_DIR, languages = langs, fallback = True)
\ No newline at end of file
+ self.lang = gettext.translation("OpenShot", localedir, languages = langs, fallback = True)
--- openshot-1.3.0.orig/openshot/windows/preferences.py
+++ openshot-1.3.0/openshot/windows/preferences.py
@@ -25,19 +25,12 @@ from classes import profiles, project, m
from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
from xdg.IconTheme import *
-# init the foriegn language
-import language.Language_Init as Language_Init
-
class PreferencesMgr(SimpleGtkBuilderApp):
def __init__(self, path="Preferences.ui", root="frmPreferences", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
self.project = project
self.form = form
@@ -218,7 +211,6 @@ class PreferencesMgr(SimpleGtkBuilderApp
def on_cmbUseStockIcons_changed(self, widget, *args):
- _ = self._
use_stock_icons = self.cmbUseStockIcons.get_active_text()
if use_stock_icons == _("Yes"):
@@ -231,7 +223,6 @@ class PreferencesMgr(SimpleGtkBuilderApp
def on_cmbSmoothScrolling_changed(self, widget, *args):
- _ = self._
use_affine = self.cmbSmoothScrolling.get_active_text()
if use_affine == _("Yes"):
@@ -368,11 +359,6 @@ class Settings:
def __init__(self, project):
"""Constructor"""
- # Add language support
- translator = Language_Init.Translator(project)
- _ = translator.lang.gettext
- self._ = _
-
self.project = project
def load_settings_from_xml(self):
--- openshot-1.3.0.orig/openshot/windows/fontselector.py
+++ openshot-1.3.0/openshot/windows/fontselector.py
@@ -23,18 +23,12 @@ import os
import gtk, pango
from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
-# init the foreign language
-from language import Language_Init
-
class frmFontProperties(SimpleGtkBuilderApp):
def __init__(self, instance, path="fontselector.ui", root="frmFontProperties", domain="OpenShot", project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
-
self.calling_form = instance
#get the list of available fonts
--- openshot-1.3.0.orig/openshot/windows/UploadVideo.py
+++ openshot-1.3.0/openshot/windows/UploadVideo.py
@@ -32,19 +32,12 @@ from windows import preferences
from classes import project, messagebox
from uploads.manager import UploadManager
-# init the foreign language
-from language import Language_Init
-
class frmUploadVideo(SimpleGtkBuilderApp):
def __init__(self, path="UploadVideo.ui", root="frmUploadVideo", domain="OpenShot", form=None, project=None, filename=None, service_name=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
self.form = form
self.project = project
self.filename = filename
@@ -101,9 +94,6 @@ class frmUploadVideo(SimpleGtkBuilderApp
def on_btnAuthorize_clicked(self, widget, *args):
print "on_btnAuthorize_clicked"
- # get translation object
- _ = self._
-
if self.cboUploadService.get_active_text():
service_name = str(self.cboUploadService.get_active_text())
service = self.upload_services[service_name]
@@ -145,7 +135,6 @@ class frmUploadVideo(SimpleGtkBuilderApp
def on_btnUpload_clicked(self, widget, *args):
print "on_btnUpload_clicked"
- _ = self._
if self.cboUploadService.get_active_text():
# get upload service
@@ -177,9 +166,6 @@ class frmUploadVideo(SimpleGtkBuilderApp
def set_dropdown_values(self, value_to_set, combobox):
- # get reference to gettext
- _ = self._
-
model = combobox.get_model()
iter = model.get_iter_first()
while True:
--- openshot-1.3.0.orig/openshot/windows/TreeHistory.py
+++ openshot-1.3.0/openshot/windows/TreeHistory.py
@@ -20,18 +20,11 @@ import os
import gtk, gobject, pango, mlt
from classes import project, effect
-# init the foreign language
-from language import Language_Init
-
class OpenShotTree:
def __init__(self, treeview, project):
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
# init vars
self.treeview = treeview
self.project = project
@@ -50,9 +43,6 @@ class OpenShotTree:
def populate_tree(self, history_index):
- # get correct gettext method
- _ = self._
-
# clear the tree data
self.store.clear()
--- openshot-1.3.0.orig/openshot/windows/TreeFiles.py
+++ openshot-1.3.0/openshot/windows/TreeFiles.py
@@ -20,17 +20,11 @@ import os
import gtk, gobject, pango
from classes import project
-# init the foreign language
-from language import Language_Init
-
class OpenShotTree:
def __init__(self, treeview, project):
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
-
# init vars
self.treeview = treeview
self.project = project
--- openshot-1.3.0.orig/openshot/windows/TreeEffects.py
+++ openshot-1.3.0/openshot/windows/TreeEffects.py
@@ -20,18 +20,11 @@ import os
import gtk, gobject, pango, mlt
from classes import project, effect
-# init the foreign language
-from language import Language_Init
-
class OpenShotTree:
def __init__(self, treeview, project):
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
# init vars
self.treeview = treeview
self.project = project
@@ -77,9 +70,6 @@ class OpenShotTree:
def populate_tree(self, clip_effects=None, category=None, filter=None):
- # get correct gettext method
- _ = self._
-
# set filter category (if any)
if category:
self.filter_category = category
@@ -152,9 +142,6 @@ class OpenShotTree:
def does_match_filter(self, my_effect, filter):
""" Determine if a filter matches """
- # get correct gettext method
- _ = self._
-
# 1st match the filter category
if self.filter_category == "Show All":
@@ -197,9 +184,6 @@ class OpenShotTree:
def get_real_effect(self, service=None, title=None):
""" Get the actual effect object from the service name """
- # get correct gettext method
- _ = self._
-
# loop through the effects
for my_effect in self.project.form.effect_list:
--- openshot-1.3.0.orig/openshot/windows/TreeBlender.py
+++ openshot-1.3.0/openshot/windows/TreeBlender.py
@@ -20,18 +20,11 @@ import os
import gtk, gobject, pango, mlt
from classes import project, effect
-# init the foreign language
-from language import Language_Init
-
class OpenShotTree:
def __init__(self, treeview, project):
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
# init vars
self.treeview = treeview
self.project = project
@@ -55,9 +48,6 @@ class OpenShotTree:
def populate_tree(self, clip_effects=None):
- # get correct gettext method
- _ = self._
-
# clear the tree data
self.store.clear()
@@ -105,9 +95,6 @@ class OpenShotTree:
def get_real_effect(self, service=None, title=None):
""" Get the actual effect object from the service name """
- # get correct gettext method
- _ = self._
-
# loop through the effects
for my_effect in self.project.form.blender_list:
--- openshot-1.3.0.orig/openshot/windows/TransitionProperties.py
+++ openshot-1.3.0/openshot/windows/TransitionProperties.py
@@ -20,17 +20,11 @@ import os
import gtk
from classes import messagebox, profiles, project, video
from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
-# init the foreign language
-from language import Language_Init
class frmTransitionProperties(SimpleGtkBuilderApp):
def __init__(self, path="TransitionProperties.ui", root="frmTransitionProperties", domain="OpenShot", form=None, project=None, current_transition=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
# add items to direction combo
options = [_("Transition"), _("Mask")]
@@ -63,9 +57,6 @@ class frmTransitionProperties(SimpleGtkB
def set_type_dropdown(self):
- # get correct gettext method
- _ = self._
-
# get the model and iterator of the project type dropdown box
model = self.cboType.get_model()
iter = model.get_iter_first()
@@ -101,9 +92,6 @@ class frmTransitionProperties(SimpleGtkB
def set_direction_dropdown(self):
- # get correct gettext method
- _ = self._
-
# get the model and iterator of the project type dropdown box
model = self.cboDirection.get_model()
iter = model.get_iter_first()
@@ -140,9 +128,6 @@ class frmTransitionProperties(SimpleGtkB
def on_cboType_changed(self, widget, *args):
print "on_cboType_changed"
- # get correct gettext method
- _ = self._
-
# get new type
localType = self.cboType.get_active_text()
@@ -168,9 +153,6 @@ class frmTransitionProperties(SimpleGtkB
def on_btnApply_clicked(self, widget, *args):
print "on_btnApply_clicked"
- # get correct gettext method
- _ = self._
-
# Get settings
localcboType = self.cboType.get_active_text()
localcboDirection = self.cboDirection.get_active_text().lower()
--- openshot-1.3.0.orig/openshot/windows/Titles.py
+++ openshot-1.3.0/openshot/windows/Titles.py
@@ -35,20 +35,11 @@ from windows.SimpleGtkBuilderApp import
from windows import fontselector
-
-# init the foriegn language
-import language.Language_Init as Language_Init
-
-
class frmNewTitle(SimpleGtkBuilderApp):
def __init__(self, path="titles.ui", root="frmTitles", domain="OpenShot", form=None, project=None, file=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
self.project = project
self.form = form
self.file = file
@@ -274,9 +265,6 @@ class frmNewTitle(SimpleGtkBuilderApp):
def on_btnApply_clicked(self, widget):
- # get translation method
- _ = self._
-
#import the file to the project.
self.project.project_folder.AddFile(self.filename)
self.project.thumbnailer.get_thumb_at_frame(self.filename)
@@ -502,9 +490,6 @@ class frmEditText(SimpleGtkBuilderApp):
def __init__(self, instance, path="titles_edit.ui", root="frmEditText", domain="OpenShot", number_of_text_boxes=0, tspans=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
-
self.frmTitles = instance
self.tspans = tspans
self.number_of_text_boxes = number_of_text_boxes
--- openshot-1.3.0.orig/openshot/windows/Profiles.py
+++ openshot-1.3.0/openshot/windows/Profiles.py
@@ -27,18 +27,11 @@ from windows import preferences
from classes import profiles, messagebox
-# init the foriegn language
-import language.Language_Init as Language_Init
-
class frmProfilesManager(SimpleGtkBuilderApp):
def __init__(self, path="profiles.ui", root="frmProfiles", domain="OpenShot", form=None, parent=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
self.project = project
self.form = form
self.parent = parent
@@ -76,9 +69,6 @@ class frmProfilesManager(SimpleGtkBuilde
def set_project_type_dropdown(self, item):
- # get reference to gettext
- _ = self._
-
# get the model and iterator of the project type dropdown box
model = self.cmbProjectType.get_model()
iter = model.get_iter_first()
@@ -111,9 +101,6 @@ class frmProfilesManager(SimpleGtkBuilde
def init_properties(self, profile):
- # get correct gettext method
- _ = self._
-
# get the mlt profile
localType = profile
p = profiles.mlt_profiles(self.project).get_profile(localType)
@@ -259,9 +246,6 @@ class frmProfilesManager(SimpleGtkBuilde
def on_btnDelete_clicked(self, widget, *args):
- # get correct gettext method
- _ = self._
-
#get the active profile
model = self.cmbProjectType.get_model()
iter = self.cmbProjectType.get_active_iter()
@@ -306,7 +290,7 @@ class frmProfilesManager(SimpleGtkBuilde
def on_btnImport_clicked(self, widget, *args):
- file_open = gtk.FileChooserDialog(title="Select Profile"
+ file_open = gtk.FileChooserDialog(title=_("Select Profile")
, action=gtk.FILE_CHOOSER_ACTION_OPEN
, buttons=(gtk.STOCK_CANCEL
, gtk.RESPONSE_CANCEL
@@ -314,13 +298,13 @@ class frmProfilesManager(SimpleGtkBuilde
, gtk.RESPONSE_OK))
#add the file filters
filter = gtk.FileFilter()
- filter.set_name("tar archives")
+ filter.set_name(_("tar archives"))
filter.add_pattern("*.tar.gz")
filter.add_pattern("*.tar.bz2")
file_open.add_filter(filter)
#add the 'all files' filter"""
filter = gtk.FileFilter()
- filter.set_name("All files")
+ filter.set_name(_("All files"))
filter.add_pattern("*")
file_open.add_filter(filter)
--- openshot-1.3.0.orig/openshot/windows/OpenProject.py
+++ openshot-1.3.0/openshot/windows/OpenProject.py
@@ -21,9 +21,6 @@ import gtk
from classes import messagebox, project
from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
-# init the foriegn language
-import language.Language_Init as Language_Init
-
class frmOpenProject(SimpleGtkBuilderApp):
@@ -33,9 +30,6 @@ class frmOpenProject(SimpleGtkBuilderApp
self.project = project
self.form = self.project.form
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
-
# set a file type filter (to limit the files to only valid files)
OSPfilter = gtk.FileFilter()
OSPfilter.add_pattern("*.osp")
--- openshot-1.3.0.orig/openshot/windows/NewProject.py
+++ openshot-1.3.0/openshot/windows/NewProject.py
@@ -21,9 +21,6 @@ import gtk
from classes import messagebox, profiles, project
from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
-# init the foreign language
-from language import Language_Init
-
# This form is used to create new projects and save
# existing projects
@@ -33,10 +30,6 @@ class frmNewProject(SimpleGtkBuilderApp)
print "init"
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- self._ = Language_Init.Translator(project).lang.gettext
- _ = self._
-
# project instance
self.project = project
self.form = project.form
@@ -98,9 +91,6 @@ class frmNewProject(SimpleGtkBuilderApp)
def set_dropdown_values(self, value_to_set, combobox):
- # get reference to gettext
- _ = self._
-
model = combobox.get_model()
iter = model.get_iter_first()
while True:
--- openshot-1.3.0.orig/openshot/windows/MainGTK.py
+++ openshot-1.3.0/openshot/windows/MainGTK.py
@@ -34,8 +34,6 @@ from windows import About, FilePropertie
from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
from windows import AddFiles, ClipProperties, ExportVideo, UploadVideo, ImportImageSeq, Titles, TransitionProperties, TreeFiles, IcvTransitions, TreeEffects, TreeHistory, BlenderGenerator, AddToTimeline, ImportTransitions, ExportXML
-# init the foreign language
-from language import Language_Init
from xdg.IconTheme import *
@@ -50,10 +48,6 @@ class frmMain(SimpleGtkBuilderApp):
# Load the Glade form using the SimpleGtkBuilderApp module
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
# project instance
self.project = project
self.project.form = self
@@ -345,14 +339,10 @@ class frmMain(SimpleGtkBuilderApp):
def translate(self, text):
""" Translate any string to the current locale. """
- return self._(text)
+ return _(text)
def get_avformats(self, melt_command):
-
- # get translation object
- _ = self._
-
#populate the codecs
formats = av_formats.formats(melt_command)
#video codecs
@@ -482,9 +472,6 @@ class frmMain(SimpleGtkBuilderApp):
def on_nbFiles_switch_page(self, widget, *args):
print "on_nbFiles_switch_page"
- # get translation object
- _ = self._
-
# new page position
new_page_pos = args[1]
@@ -706,9 +693,6 @@ class frmMain(SimpleGtkBuilderApp):
def does_match_filter(self, file_object, filter):
""" Determine if a filter matches a project file """
- # get correct gettext method
- _ = self._
-
# get just the filename (not the entire path)
(dirName, file_name) = os.path.split(file_object.name)
@@ -933,10 +917,6 @@ class frmMain(SimpleGtkBuilderApp):
def refresh(self):
-
- # get correct gettext method
- _ = self._
-
"""Called when the Treeview is active"""
# Set the title of the window
self.frmMain.set_title("OpenShot - %s" % (self.project.name))
@@ -959,10 +939,6 @@ class frmMain(SimpleGtkBuilderApp):
def refresh_files(self, category=None, filter=None):
-
- # get correct gettext method
- _ = self._
-
# Clear the file treeview
self.OSTreeFiles.store.clear()
@@ -1369,7 +1345,7 @@ class frmMain(SimpleGtkBuilderApp):
self.new_transition.translate (distance_from_clip, bottom_y - self.new_transition.get_bounds().y1)
# mark project as modified
- self.project.set_project_modified(is_modified=True, refresh_xml=True, type="Added transition")
+ self.project.set_project_modified(is_modified=True, refresh_xml=True, type=_("Added transition"))
else:
# remove this transition (from the project)
@@ -1467,10 +1443,6 @@ class frmMain(SimpleGtkBuilderApp):
self.hscrollbar2.get_adjustment().set_page_size(self.timeline_scrolled_window_width)
def on_frmMain_delete_event(self, widget, *args):
-
- # get correct gettext method
- _ = self._
-
# pre-destroy event
# prompt user to save (if needed)
#if len(self.project.project_folder.items) > 0:
@@ -1640,9 +1612,6 @@ class frmMain(SimpleGtkBuilderApp):
def on_mnuPreferences_activate(self, widget, *args):
print "on_mnuPreferences_activate called with self.%s" % widget.get_name()
- # get correct gettext method
- _ = self._
-
# open preferences window
preferences.PreferencesMgr(project=self.project, form=self)
@@ -1669,9 +1638,6 @@ class frmMain(SimpleGtkBuilderApp):
def on_mnuHelpContents_activate(self, widget, *args):
print "on_mnuHelpContents_activate called with self.%s" % widget.get_name()
- # get translation object
- _ = self._
-
#show Help contents
try:
#need to use the relative path until we can get
@@ -1687,9 +1653,6 @@ class frmMain(SimpleGtkBuilderApp):
def on_mnuReportBug_activate(self, widget, *args):
print "on_mnuReportBug_activate called with self.%s" % widget.get_name()
- # get translation object
- _ = self._
-
#open the launchpad bug page with the users default browser
try:
webbrowser.open("https://bugs.launchpad.net/openshot/+filebug")
@@ -1700,9 +1663,6 @@ class frmMain(SimpleGtkBuilderApp):
def on_mnuAskQuestion_activate(self, widget, *args):
print "on_mnuAskQuestion_activate called with self.%s" % widget.get_name()
- # get translation object
- _ = self._
-
#open the launchpad answers page with the users default browser
try:
webbrowser.open("https://answers.launchpad.net/openshot/+addquestion")
@@ -1712,9 +1672,6 @@ class frmMain(SimpleGtkBuilderApp):
def on_mnuTranslate_activate(self, widget, *args):
print "on_mnuTranslate_activate called with self.%s" % widget.get_name()
- # get translation object
- _ = self._
-
#open the launchpad answers page with the users default browser
try:
webbrowser.open("https://translations.launchpad.net/openshot")
@@ -1898,9 +1855,6 @@ class frmMain(SimpleGtkBuilderApp):
def on_tlbSeekBackward_clicked(self, widget, single_frame=False, *args):
print "on_tlbSeekBackward_clicked"
-
- # get correct gettext method
- _ = self._
# Refresh the MLT XML file
self.project.RefreshXML()
@@ -1934,9 +1888,6 @@ class frmMain(SimpleGtkBuilderApp):
def on_tlbSeekForward_clicked(self, widget, single_frame=False, *args):
print "on_tlbSeekForward_clicked"
- # get correct gettext method
- _ = self._
-
# Refresh the MLT XML file
self.project.RefreshXML()
@@ -2014,9 +1965,6 @@ class frmMain(SimpleGtkBuilderApp):
def on_tlbPrevious_clicked(self, widget, *args):
print "on_tlbPrevious_clicked called with self.%s" % widget.get_name()
- # get correct gettext method
- _ = self._
-
# Refresh the MLT XML file
self.project.RefreshXML()
@@ -2036,9 +1984,6 @@ class frmMain(SimpleGtkBuilderApp):
def on_tlbPlay_clicked(self, widget, *args):
print "on_tlbPlay_clicked called with self.%s" % widget.get_name()
- # get correct gettext method
- _ = self._
-
# Get the current speed
current_speed = self.MyVideo.get_speed()
@@ -2066,9 +2011,6 @@ class frmMain(SimpleGtkBuilderApp):
def on_tlbNext_clicked(self, widget, *args):
print "on_tlbNext_clicked called with self.%s" % widget.get_name()
- # get correct gettext method
- _ = self._
-
# Refresh the MLT XML file
self.project.RefreshXML()
@@ -2246,10 +2188,6 @@ class frmMain(SimpleGtkBuilderApp):
def on_tlbAddTrack_clicked(self, widget, *args):
-
- # get correct gettext method
- _ = self._
-
# Add a new track to the timeline
self.project.sequences[0].AddTrack(_("Track %s") % str(len(self.project.sequences[0].tracks) + 1))
self.project.Render()
@@ -2338,10 +2276,6 @@ class frmMain(SimpleGtkBuilderApp):
def on_hsZoom_value_changed(self, widget, *args):
-
- # get correct gettext method
- _ = self._
-
# get current horizontal scroll position & time
pixels_per_second = self.project.sequences[0].get_pixels_per_second()
current_scroll_pixels = self.hscrollbar2.get_value()
@@ -2364,10 +2298,6 @@ class frmMain(SimpleGtkBuilderApp):
self.scroll_to_last(current_scroll_time)
def on_hsZoom_change_value(self, widget, *args):
-
- # get correct gettext method
- _ = self._
-
# get the value of the zoom slider (this value represents the number of seconds
# between the tick marks on the timeline ruler
new_zoom_value = widget.get_value()
@@ -2586,10 +2516,6 @@ class mnuTrack(SimpleGtkBuilderApp):
def __init__(self, rows, selected, path="Main_track_menu.ui", root="mnuTrackPopup", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
self.form = form
self.project = project
@@ -2606,9 +2532,6 @@ class mnuTrack(SimpleGtkBuilderApp):
def on_mnuAddTrackAbove_activate(self, event, *args):
print "on_mnuAddTrackAbove_activate clicked"
- # get correct gettext method
- _ = self._
-
# remove this track from it's parent sequence
self.project.sequences[0].AddTrack(_("Track %s") % str(len(self.project.sequences[0].tracks) + 1), position="above", existing_track=self.selected_track)
@@ -2619,9 +2542,6 @@ class mnuTrack(SimpleGtkBuilderApp):
def on_mnuAddTrackBelow_activate(self, event, *args):
print "on_mnuAddTrackBelow_activate clicked"
- # get correct gettext method
- _ = self._
-
# remove this track from it's parent sequence
self.project.sequences[0].AddTrack(_("Track %s") % str(len(self.project.sequences[0].tracks) + 1), position="below", existing_track=self.selected_track)
@@ -2632,9 +2552,6 @@ class mnuTrack(SimpleGtkBuilderApp):
def on_mnuRenameTrack_activate(self, event, *args):
print "on_mnuRenameTrack_activate clicked"
- # get correct gettext method
- _ = self._
-
# get the new name of the track
text = inputbox.input_box(title="Openshot", message=_("Please enter a track name."), default_text=self.selected_track.name)
@@ -2700,10 +2617,6 @@ class mnuMarker(SimpleGtkBuilderApp):
def __init__(self, rows, selected, path="Main_marker_menu.ui", root="mnuMarkerPopup", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
self.form = form
self.project = project
@@ -2735,20 +2648,12 @@ class mnuTransition(SimpleGtkBuilderApp)
def __init__(self, rows, selected, path="Main_transition_properties.ui", root="mnuTransitionPopup", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
self.form = form
self.project = project
def showmnu(self, event, object, canvas_item):
-
- # get correct gettext method
- _ = self._
-
if object.type == "transition":
self.mnuMask.get_children()[0].set_label(_("Convert to Mask"))
self.mnuRemoveTransition.get_children()[0].set_label(_("Remove Transition"))
@@ -2787,7 +2692,7 @@ class mnuTransition(SimpleGtkBuilderApp)
new_trans.mask_value = self.selected_transition.mask_value
# mark project as modified
- self.project.set_project_modified(is_modified=True, refresh_xml=True, type="Duplicated transition")
+ self.project.set_project_modified(is_modified=True, refresh_xml=True, type=_("Duplicated transition"))
# render to timeline
new_trans.Render()
@@ -2796,9 +2701,6 @@ class mnuTransition(SimpleGtkBuilderApp)
def on_mnuMask_activate(self, event, *args):
print "on_mnuMask_activate"
- # get correct gettext method
- _ = self._
-
# update type
if self.selected_transition.type == "transition":
self.selected_transition.type = "mask"
@@ -2859,9 +2761,6 @@ class mnuTransition(SimpleGtkBuilderApp)
index_of_selected_transition = transitions_on_track.index(self.selected_transition) - 1
if index_of_selected_transition >= 0:
previous_transition = transitions_on_track[index_of_selected_transition]
-
- # get correct gettext method
- _ = self._
# get the amount of time the transitions are shifted
text = inputbox.input_box(title="OpenShot", message=_("Please enter the # of seconds to shift the transitions:"), default_text="5.0")
@@ -2930,10 +2829,6 @@ class mnuFadeSubMenu(SimpleGtkBuilderApp
def __init__(self, rows, selected, path="Main_fade_menu.ui", root="mnuFadeSubMenuPopup", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
self.form = form
self.project = project
@@ -2952,9 +2847,6 @@ class mnuFadeSubMenu(SimpleGtkBuilderApp
def on_mnuFade_activate(self, event, *args):
print "on_mnuFade_activate"
- # update the gettext method
- _ = self._
-
# get name of animation
fade_name = ""
try:
@@ -3027,16 +2919,12 @@ class mnuFadeSubMenu(SimpleGtkBuilderApp
self.selected_clip.video_fade_amount = 4.0
# mark project as modified
- self.project.set_project_modified(is_modified=True, refresh_xml=True, type="Changed clip fade")
+ self.project.set_project_modified(is_modified=True, refresh_xml=True, type=_("Changed clip fade"))
class mnuRotateSubMenu(SimpleGtkBuilderApp):
def __init__(self, rows, selected, path="Main_rotate_menu.ui", root="mnuRotateSubMenuPopup", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
self.form = form
self.project = project
@@ -3055,9 +2943,6 @@ class mnuRotateSubMenu(SimpleGtkBuilderA
def on_mnuRotate_activate(self, event, *args):
print "on_mnuRotate_activate"
- # update the gettext method
- _ = self._
-
# get name of animation
rotate_name = ""
try:
@@ -3088,16 +2973,12 @@ class mnuRotateSubMenu(SimpleGtkBuilderA
self.selected_clip.rotation = 0
# mark project as modified
- self.project.set_project_modified(is_modified=True, refresh_xml=True, type="Changed clip rotation")
+ self.project.set_project_modified(is_modified=True, refresh_xml=True, type=_("Changed clip rotation"))
class mnuPlayheadSubMenu(SimpleGtkBuilderApp):
def __init__(self, rows, selected, path="Main_playhead_menu.ui", root="mnuPlayheadSubMenuPopup", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
self.form = form
self.project = project
@@ -3122,10 +3003,6 @@ class mnuAnimateSubMenu(SimpleGtkBuilder
def __init__(self, rows, selected, path="Main_animate_menu.ui", root="mnuAnimateSubMenuPopup", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
self.form = form
self.project = project
@@ -3144,9 +3021,6 @@ class mnuAnimateSubMenu(SimpleGtkBuilder
def on_mnuAnimate_activate(self, event, *args):
print "on_mnuAnimate_activate"
- # update the gettext method
- _ = self._
-
# get name of animation
animation_name = ""
try:
@@ -3255,7 +3129,7 @@ class mnuAnimateSubMenu(SimpleGtkBuilder
self.selected_clip.valign = valign
# mark project as modified
- self.project.set_project_modified(is_modified=True, refresh_xml=True, type="Changed clip animation")
+ self.project.set_project_modified(is_modified=True, refresh_xml=True, type=_("Changed clip animation"))
@@ -3263,10 +3137,6 @@ class mnuPositionSubMenu(SimpleGtkBuilde
def __init__(self, rows, selected, path="Main_layout_menu.ui", root="mnuPositionSubMenuPopup", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
self.form = form
self.project = project
@@ -3285,9 +3155,6 @@ class mnuPositionSubMenu(SimpleGtkBuilde
def on_mnuPosition_activate(self, event, *args):
print "on_mnuPosition_activate"
- # update the gettext method
- _ = self._
-
# get name of animation
position_name = ""
try:
@@ -3341,7 +3208,7 @@ class mnuPositionSubMenu(SimpleGtkBuilde
self.selected_clip.valign = valign
# mark project as modified
- self.project.set_project_modified(is_modified=True, refresh_xml=True, type="Changed clip layout")
+ self.project.set_project_modified(is_modified=True, refresh_xml=True, type=_("Changed clip layout"))
def show_all_clips(self, stretch=False):
""" Show all clips """
@@ -3417,10 +3284,6 @@ class mnuClip(SimpleGtkBuilderApp):
def __init__(self, rows, selected, path="Main_clip_properties.ui", root="mnuClipPopup", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
self.form = form
self.project = project
@@ -3507,9 +3370,6 @@ class mnuClip(SimpleGtkBuilderApp):
index_of_selected_clip = clips_on_track.index(self.selected_clip) - 1
if index_of_selected_clip >= 0:
previous_clip = clips_on_track[index_of_selected_clip]
-
- # get correct gettext method
- _ = self._
# get the amount of time the clips are shifted
text = inputbox.input_box(title="OpenShot", message=_("Please enter the # of seconds to shift the clips:"), default_text="5.0")
@@ -3613,7 +3473,7 @@ class mnuClip(SimpleGtkBuilderApp):
new_clip.effects = copy.deepcopy(self.selected_clip.effects)
# mark project as modified
- self.project.set_project_modified(is_modified=True, refresh_xml=True, type="Duplicated clip")
+ self.project.set_project_modified(is_modified=True, refresh_xml=True, type=_("Duplicated clip"))
# render to timeline
new_clip.RenderClip()
@@ -3660,9 +3520,6 @@ class mnuClip(SimpleGtkBuilderApp):
print "on_mnuSliceandShuffle_activate"
import random
- # get correct gettext method
- _ = self._
-
# init the list of clips
min_random_length = 2.0
max_random_length = 2.0
@@ -3729,9 +3586,6 @@ class mnuClip(SimpleGtkBuilderApp):
print "on_mnuSliceandCut_activate"
import random
- # get correct gettext method
- _ = self._
-
# init the list of clips
min_random_length = 2
max_random_length = 2
@@ -3806,10 +3660,6 @@ class mnuTree(SimpleGtkBuilderApp):
def __init__(self, rows, selected, path="Main_tree_popup.ui", root="mnuTreePopUp", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
self.mnuTree = self.mnuTreePopUp
self.model = rows
self.selected = selected
@@ -3818,10 +3668,6 @@ class mnuTree(SimpleGtkBuilderApp):
def showmnu(self, event, widget):
-
- # get correct gettext method
- _ = self._
-
#Show the right click menu.
#dynamically show menu items depending on tree contents.
#The Add Folder & Add File items are in the ui file - we always want them.
@@ -4025,9 +3871,6 @@ class mnuTree(SimpleGtkBuilderApp):
def on_mnuPreview_activate(self, event, *args):
print "on_mnuPreview_activate"
-
- # get translation method
- _ = self._
if self.form.scrFileTree.get_property('visible') == True:
@@ -4184,9 +4027,6 @@ class mnuTree(SimpleGtkBuilderApp):
print "on_mnuEditTitle_activate"
prog = "inkscape"
- # get correct gettext method
- _ = self._
-
#use an external editor to edit the image
try:
@@ -4371,10 +4211,6 @@ class frmFolders(SimpleGtkBuilderApp):
def __init__(self, path="Main_folder_menu.ui", root="frmFolder", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
self.FolderDlg = self.frmFolder
self.form = form
self.project = project
--- openshot-1.3.0.orig/openshot/windows/ImportTransitions.py
+++ openshot-1.3.0/openshot/windows/ImportTransitions.py
@@ -22,18 +22,11 @@ import shutil
from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
from classes import project, messagebox
-# init the foreign language
-from language import Language_Init
-
class frmImportTransitions(SimpleGtkBuilderApp):
def __init__(self, path="ImportTransitions.ui", root="frmImportTransitions", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
self.project = project
self.form = form
@@ -69,9 +62,6 @@ class frmImportTransitions(SimpleGtkBuil
self.import_transition()
def import_transition(self):
- # get translation method
- _ = self._
-
if not os.path.exists(self.project.USER_TRANSITIONS_DIR):
os.makedirs(self.project.USER_TRANSITIONS_DIR)
os.makedirs(os.path.join(self.project.USER_TRANSITIONS_DIR, "icons"))
--- openshot-1.3.0.orig/openshot/windows/ImportImageSeq.py
+++ openshot-1.3.0/openshot/windows/ImportImageSeq.py
@@ -22,18 +22,11 @@ import re
from classes import messagebox, project
from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
-# init the foreign language
-from language import Language_Init
-
class frmImportImageSequence(SimpleGtkBuilderApp):
def __init__(self, path="ImportImageSeq.ui", root="frmImportImageSequence", domain="OpenShot", form=None, project=None, pattern=None, initial_folder=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
self.form = form
self.project = project
self.frmImportImageSequence.show_all()
@@ -70,9 +63,6 @@ class frmImportImageSequence(SimpleGtkBu
e = re.compile(r"(.*)(%)(0?)(\d*)(d)(.*)")
matches = e.findall(txtFileName1)
- # get translation object
- _ = self._
-
# Validate the the form is valid
if not matches:
# Show error message
--- openshot-1.3.0.orig/openshot/windows/IcvTransitions.py
+++ openshot-1.3.0/openshot/windows/IcvTransitions.py
@@ -20,18 +20,11 @@ import os
import gtk, gobject, pango
from classes import project, messagebox
-# init the foreign language
-from language import Language_Init
-
class OpenShotTree:
def __init__(self, view, project):
- # Add language support
- self._ = Language_Init.Translator(project).lang.gettext
- _ = self._
-
# init vars
self.view = view
self.project = project
@@ -52,8 +45,6 @@ class OpenShotTree:
def populate(self, category=None, filter=None):
- _ = self._
-
# clear store
self.store.clear()
@@ -143,9 +134,6 @@ class OpenShotTree:
def does_match_filter(self, my_trans, filter):
""" Determine if a filter matches """
- # get correct gettext method
- _ = self._
-
# 1st match the filter category
if self.filter_category == "Show All":
--- openshot-1.3.0.orig/openshot/windows/ExportXML.py
+++ openshot-1.3.0/openshot/windows/ExportXML.py
@@ -21,9 +21,6 @@ import gtk
from classes import messagebox, project
from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
-# init the foriegn language
-import language.Language_Init as Language_Init
-
class frmExportXML(SimpleGtkBuilderApp):
@@ -33,9 +30,6 @@ class frmExportXML(SimpleGtkBuilderApp):
self.project = project
self.form = self.project.form
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
-
# set a file type filter (to limit the files to only valid files)
OSPfilter = gtk.FileFilter()
OSPfilter.add_pattern("*.mlt")
--- openshot-1.3.0.orig/openshot/windows/ExportVideo.py
+++ openshot-1.3.0/openshot/windows/ExportVideo.py
@@ -34,19 +34,12 @@ from windows.SimpleGtkBuilderApp import
from windows import UploadVideo
from uploads.manager import UploadManager
-# init the foreign language
-from language import Language_Init
-
class frmExportVideo(SimpleGtkBuilderApp):
def __init__(self, path="ExportVideo.ui", root="frmExportVideo", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
# set important vars
self.form = form
self.project = project
@@ -181,9 +174,6 @@ class frmExportVideo(SimpleGtkBuilderApp
def set_project_type_dropdown(self):
- # get reference to gettext
- _ = self._
-
# get the model and iterator of the project type dropdown box
model = self.cmbProjectType.get_model()
iter = model.get_iter_first()
@@ -212,9 +202,6 @@ class frmExportVideo(SimpleGtkBuilderApp
def set_selection_dropdown(self):
- # get reference to gettext
- _ = self._
-
# get the model and iterator of the project type dropdown box
model = self.cboSelection.get_model()
iter = model.get_iter_first()
@@ -225,9 +212,6 @@ class frmExportVideo(SimpleGtkBuilderApp
def set_export_to_dropdown(self):
- # get reference to gettext
- _ = self._
-
# get the model and iterator of the project type dropdown box
model = self.cboExportTo.get_model()
iter = model.get_iter_first()
@@ -238,7 +222,6 @@ class frmExportVideo(SimpleGtkBuilderApp
def on_cboExportType_changed(self, widget, *args):
print "on_cboExportType_changed"
- _ = self._
export_type = self.cboExportType.get_active_text()
@@ -261,9 +244,6 @@ class frmExportVideo(SimpleGtkBuilderApp
def refresh_profiles_for_uploads(self):
-
- # get reference to gettext
- _ = self._
export_type = self.cboExportType.get_active_text()
if export_type == _("Upload to Web"):
@@ -283,9 +263,6 @@ class frmExportVideo(SimpleGtkBuilderApp
#first clear the combo
self.cboSimpleTarget.get_model().clear()
- # get reference to gettext
- _ = self._
-
#parse the xml files and get targets that match the project type
selected_project = self.cboSimpleProjectType.get_active_text()
@@ -327,9 +304,6 @@ class frmExportVideo(SimpleGtkBuilderApp
def on_cboSimpleTarget_changed(self, widget, *args):
#set the profiles dropdown based on the selected target
- # get reference to gettext
- _ = self._
-
self.cboSimpleVideoProfile.get_model().clear()
self.cboSimpleQuality.get_model().clear()
@@ -412,9 +386,6 @@ class frmExportVideo(SimpleGtkBuilderApp
def on_cboSimpleVideoProfile_changed(self, widget, *args):
- # get reference to gettext
- _ = self._
-
#don't do anything if the combo has been cleared
if self.cboSimpleVideoProfile.get_active_text():
profile = str(self.cboSimpleVideoProfile.get_active_text())
@@ -433,9 +404,6 @@ class frmExportVideo(SimpleGtkBuilderApp
def on_cboSimpleQuality_changed(self, widget, *args):
- # get reference to gettext
- _ = self._
-
#don't do anything if the combo has been cleared
if self.cboSimpleQuality.get_active_text():
@@ -474,12 +442,12 @@ class frmExportVideo(SimpleGtkBuilderApp
if self.invalid_codecs:
if self.use_infobar:
- self.label.set_markup(_("The following codec(s) are missing from your system:\n\n{missing_codecs}\nLearn More".format(missing_codecs = "\n".join(self.invalid_codecs))))
+ self.label.set_markup(_("The following codec(s) are missing from your system:\n\n{missing_codecs}\nLearn More").format(missing_codecs = "\n".join(self.invalid_codecs)))
self.infobar.show_all()
else:
# no infobar available (use messagebox)
if self.last_error != self.invalid_codecs:
- messagebox.show(_("Error!"), _("The following codec(s) are missing from your system:\n\n{missing_codecs}\n".format(missing_codecs = "\n".join(self.invalid_codecs))))
+ messagebox.show(_("Error!"), _("The following codec(s) are missing from your system:\n\n{missing_codecs}\n").format(missing_codecs = "\n".join(self.invalid_codecs)))
self.last_error = self.invalid_codecs
self.btnExportVideo.set_sensitive(False)
@@ -492,9 +460,6 @@ class frmExportVideo(SimpleGtkBuilderApp
def set_dropdown_values(self, value_to_set, combobox):
- # get reference to gettext
- _ = self._
-
model = combobox.get_model()
iter = model.get_iter_first()
while iter:
@@ -518,9 +483,6 @@ class frmExportVideo(SimpleGtkBuilderApp
def init_properties(self, profile):
- # get correct gettext method
- _ = self._
-
# get the mlt profile
localType = profile
p = profiles.mlt_profiles(self.project).get_profile(localType)
@@ -564,9 +526,6 @@ class frmExportVideo(SimpleGtkBuilderApp
def on_cboExportTo_changed(self, widget, *args):
print "on_cboExportTo_changed"
- # get correct gettext method
- _ = self._
-
# get the "export to" variable
localcboExportTo = self.cboExportTo.get_active_text()
localtxtFileName = str.strip(self.txtFileName.get_text())
@@ -606,9 +565,6 @@ class frmExportVideo(SimpleGtkBuilderApp
def on_btnExportVideo_clicked(self, widget, *args):
print "on_btnExportVideo_clicked"
-
- # get correct gettext method
- _ = self._
# determine if we are UPLOADING or EXPORTING
export_type = self.cboExportType.get_active_text()
@@ -763,9 +719,6 @@ class frmExportVideo(SimpleGtkBuilderApp
self.do_export()
def update_progress(self, new_percentage):
-
- # get correct gettext method
- _ = self._
# update the percentage complete
self.progressExportVideo.set_fraction(new_percentage)
--- openshot-1.3.0.orig/openshot/windows/ClipProperties.py
+++ openshot-1.3.0/openshot/windows/ClipProperties.py
@@ -24,18 +24,11 @@ from classes import profiles, project, v
from windows import preferences
import AddEffect, TreeEffects
-# init the foreign language
-from language import Language_Init
-
class frmClipProperties(SimpleGtkBuilderApp):
def __init__(self, path="ClipProperties.ui", root="frmClipProperties", domain="OpenShot", form=None, project=None, current_clip=None, current_clip_item=None, initial_tab=0, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
self.form = form
self.project = project
self.current_clip = current_clip
@@ -168,9 +161,6 @@ class frmClipProperties(SimpleGtkBuilder
def on_treeEffects_button_release_event(self, widget, *args):
print "on_treeEffects_button_release_event"
- # get correct gettext method
- _ = self._
-
# get selected effect (if any)
selected_effect, unique_id = self.get_selected_effect()
real_effect = self.OSTreeEffects.get_real_effect(service=selected_effect)
@@ -535,10 +525,6 @@ class frmClipProperties(SimpleGtkBuilder
def on_cboKeyFrame_changed(self, widget, *args):
-
- # get correct gettext method
- _ = self._
-
print "on_cboKeyFrame_changed"
localcboKeyFrame = self.cboKeyFrame.get_active_text().lower()
keyframe = None
@@ -561,10 +547,6 @@ class frmClipProperties(SimpleGtkBuilder
def on_cboSimpleSpeed_changed(self, widget, *args):
-
- # get correct gettext method
- _ = self._
-
print "on_cboSimpleSpeed_changed"
localcboSimpleSpeed = self.cboSimpleSpeed.get_active_text().lower().replace("x","")
@@ -585,9 +567,6 @@ class frmClipProperties(SimpleGtkBuilder
self.spinAdvancedSpeed.set_value(num / den)
def on_txtIn_value_changed(self, widget, *args):
- # get correct gettext method
- _ = self._
-
print "on_txtIn_value_changed"
local_in = float(self.txtIn.get_value())
local_out = float(self.txtOut.get_value())
@@ -601,9 +580,6 @@ class frmClipProperties(SimpleGtkBuilder
self.txtLength.set_text(_("{0} seconds").format(str(round(local_out - local_in, 2))))
def on_txtOut_value_changed(self, widget, *args):
- # get correct gettext method
- _ = self._
-
print "on_txtOut_value_changed"
local_in = float(self.txtIn.get_value())
local_out = float(self.txtOut.get_value())
@@ -637,9 +613,6 @@ class frmClipProperties(SimpleGtkBuilder
def set_speed_dropdown(self):
- # get correct gettext method
- _ = self._
-
# get the model and iterator of the project type dropdown box
model = self.cboSimpleSpeed.get_model()
iter = model.get_iter_first()
@@ -699,9 +672,6 @@ class frmClipProperties(SimpleGtkBuilder
def set_direction_dropdown(self):
- # get correct gettext method
- _ = self._
-
# get the model and iterator of the project type dropdown box
model = self.cboDirection.get_model()
iter = model.get_iter_first()
@@ -774,9 +744,6 @@ class frmClipProperties(SimpleGtkBuilder
def apply_settings(self, clip_object):
- # get correct gettext method
- _ = self._
-
# get the frames per second (from the project)
fps = self.project.fps()
@@ -949,7 +916,7 @@ class frmClipProperties(SimpleGtkBuilder
self.current_clip.effects = copy.deepcopy(self.copy_of_clip.effects)
# mark project as modified
- self.project.set_project_modified(is_modified=True, refresh_xml=True, type = self._("Modified clip properties"))
+ self.project.set_project_modified(is_modified=True, refresh_xml=True, type = _("Modified clip properties"))
# remove from canvas
parent = self.current_clip_item.get_parent()
--- openshot-1.3.0.orig/openshot/windows/BlenderGenerator.py
+++ openshot-1.3.0/openshot/windows/BlenderGenerator.py
@@ -24,19 +24,12 @@ from windows.SimpleGtkBuilderApp import
from windows import preferences, TreeBlender
from classes import project, messagebox, files
-# init the foreign language
-from language import Language_Init
-
class frm3dGenerator(SimpleGtkBuilderApp):
def __init__(self, path="BlenderGenerator.ui", root="frm3dGenerator", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
self.form = form
self.project = project
self.unique_folder_name = str(uuid.uuid1())
@@ -160,9 +153,6 @@ class frm3dGenerator(SimpleGtkBuilderApp
def on_treeTemplates_button_release_event(self, widget, *args):
print "on_treeTemplates_button_release_event"
- # get correct gettext method
- _ = self._
-
# get selected effect (if any)
selected_effect, unique_id = self.get_selected_effect()
real_effect = self.OSTreeBlender.get_real_effect(service=selected_effect)
@@ -579,7 +569,6 @@ class frm3dGenerator(SimpleGtkBuilderApp
def error_with_blender(self, version=None, command_output=None):
""" Show a friendly error message regarding the blender executable or version. """
- _ = self._
version_message = ""
if version:
@@ -599,9 +588,6 @@ class frm3dGenerator(SimpleGtkBuilderApp
""" Add this image sequence to the current project, and copy the images into the
current project folder. """
- # get reference to translation method
- _ = self._
-
# Create the target folder (in the project folder)
target_folder = os.path.join(self.project.folder, self.unique_folder_name)
if not os.path.exists(target_folder):
--- openshot-1.3.0.orig/openshot/windows/AddToTimeline.py
+++ openshot-1.3.0/openshot/windows/AddToTimeline.py
@@ -23,19 +23,12 @@ from windows.SimpleGtkBuilderApp import
from windows import preferences, TreeFiles
from classes import project, messagebox, timeline, files
-# init the foreign language
-from language import Language_Init
-
class frmAddToTimeline(SimpleGtkBuilderApp):
def __init__(self, path="AddToTimeline.ui", root="frmAddToTimeline", domain="OpenShot", form=None, project=None, selected_files=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
self.form = form
self.project = project
self.selected_files = selected_files
@@ -61,9 +54,6 @@ class frmAddToTimeline(SimpleGtkBuilderA
def init_transitions(self):
-
- # get translation object
- _ = self._
# init the transition length
self.txtTransitionLength.set_value(2.0)
@@ -97,9 +87,6 @@ class frmAddToTimeline(SimpleGtkBuilderA
def init_tracks(self):
- # get translation object
- _ = self._
-
# validate that 2 tracks are present
if len(self.project.sequences[0].tracks) == 0:
# no tracks, so add 2
@@ -128,9 +115,6 @@ class frmAddToTimeline(SimpleGtkBuilderA
def init_fade(self):
- # get translation object
- _ = self._
-
# init the transition length
self.txtFadeLength.set_value(2.0)
@@ -148,9 +132,6 @@ class frmAddToTimeline(SimpleGtkBuilderA
def init_animation(self):
- # get translation object
- _ = self._
-
model = self.cboAnimation.get_model()
model.clear()
@@ -269,9 +250,6 @@ class frmAddToTimeline(SimpleGtkBuilderA
def set_dropdown_values(self, value_to_set, combobox):
- # get reference to gettext
- _ = self._
-
model = combobox.get_model()
iter = model.get_iter_first()
while iter:
@@ -297,9 +275,6 @@ class frmAddToTimeline(SimpleGtkBuilderA
def on_btnAdd_clicked(self, widget, *args):
print "on_btnAdd_clicked"
- # get reference to gettext
- _ = self._
-
# get settings
new_clip = None
start_time = self.txtStartTime.get_value()
@@ -407,7 +382,7 @@ class frmAddToTimeline(SimpleGtkBuilderA
self.form.expand_timeline(new_clip)
#mark the project as modified
- self.project.set_project_modified(is_modified=True, refresh_xml=True, type="Added files to timeline")
+ self.project.set_project_modified(is_modified=True, refresh_xml=True, type=_("Added files to timeline"))
# close this window
self.frmAddToTimeline.destroy()
--- openshot-1.3.0.orig/openshot/windows/AddFiles.py
+++ openshot-1.3.0/openshot/windows/AddFiles.py
@@ -23,18 +23,12 @@ from windows.SimpleGtkBuilderApp import
from windows import preferences
from classes import project, messagebox
-# init the foreign language
-from language import Language_Init
-
class frmAddFiles(SimpleGtkBuilderApp):
def __init__(self, path="AddFiles.ui", root="frmAddFiles", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
-
self.frmAddFiles.set_action(gtk.FILE_CHOOSER_ACTION_OPEN)
self.frmAddFiles.set_select_multiple(True)
@@ -87,9 +81,6 @@ class frmReplaceFiles(SimpleGtkBuilderAp
def __init__(self, path="AddFiles.ui", root="frmAddFiles", domain="OpenShot", form=None, project=None,clip=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
self.frmAddFiles.set_title("OpenShot")
self.frmAddFiles.set_action(gtk.FILE_CHOOSER_ACTION_OPEN)
--- openshot-1.3.0.orig/openshot/windows/AddEffect.py
+++ openshot-1.3.0/openshot/windows/AddEffect.py
@@ -21,17 +21,11 @@ import gtk
from classes import messagebox, project, effect
from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
-# init the foreign language
-from language import Language_Init
-
class frmAddEffect(SimpleGtkBuilderApp):
def __init__(self, path="AddEffect.ui", root="frmAddEffect", domain="OpenShot", parent=None, form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
-
self.form = form
self.project = project
self.parent = parent
--- openshot-1.3.0.orig/openshot/windows/About.py
+++ openshot-1.3.0/openshot/windows/About.py
@@ -22,17 +22,11 @@ from classes.project import project
from classes import messagebox, info
from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
-# init the foreign language
-from language import Language_Init
-
class frmAbout(SimpleGtkBuilderApp):
def __init__(self, path="About.ui", root="aboutdialog1", domain="OpenShot", version="0.0.0", project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
-
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
# set version from constructor
self.aboutdialog1.set_version(version)
--- openshot-1.3.0.orig/openshot/windows/FileProperties.py
+++ openshot-1.3.0/openshot/windows/FileProperties.py
@@ -21,18 +21,12 @@ import gtk, pango
from classes import messagebox, project, timeline
from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
-# init the foreign language
-from language import Language_Init
-
class frmFileproperties(SimpleGtkBuilderApp):
def __init__(self, file, path="FileProperties.ui", root="frmFileProperties", domain="OpenShot", form=None, project=None, **kwargs):
SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
-
self.form = form
self.project = project
self.file = file
--- openshot-1.3.0.orig/openshot/classes/project.py
+++ openshot-1.3.0/openshot/classes/project.py
@@ -21,9 +21,6 @@ import gtk, re
import xml.dom.minidom as xml
from classes import profiles, files, thumbnail, open_project, save_project, state_project, restore_state, sequences, video, theme
-# init the foreign language
-from language import Language_Init
-
########################################################################
class project():
"""This is the main project class that contains all
@@ -62,10 +59,6 @@ class project():
# this project file...
if init_threads:
- # Add language support
- translator = Language_Init.Translator(self)
- _ = translator.lang.gettext
-
# init the variables for the project
from windows import preferences
self.name = _("Default Project")
--- openshot-1.3.0.orig/openshot/classes/messagebox.py
+++ openshot-1.3.0/openshot/classes/messagebox.py
@@ -19,9 +19,6 @@
import gtk, os, sys
from xdg.IconTheme import *
-# init the foreign language
-from language import Language_Init
-
def get_response(*args):
# look for extra parameters
--- openshot-1.3.0.orig/openshot/classes/track.py
+++ openshot-1.3.0/openshot/classes/track.py
@@ -20,9 +20,6 @@ import uuid
import gtk, goocanvas
from classes import clip, files, transition
-# init the foreign language
-from language import Language_Init
-
class track:
"""The track class contains a simple grouping of clips on the same layer (aka track)."""
@@ -30,10 +27,6 @@ class track:
def __init__(self, track_name, parent_sequence):
"""Constructor"""
- # Add language support
- translator = Language_Init.Translator(parent_sequence.project)
- _ = translator.lang.gettext
-
# init variables for sequence
self.name = track_name
self.x = 10 # left x coordinate to start the track
@@ -115,9 +108,6 @@ class track:
def RenderTrack(self):
"""This adds a track to the canvas with 3 images: a left, middle, and right"""
- # get a reference to the language translate method
- _ = self.parent.project.translate
-
# get the pixels per second from the parent sequence
pixels_per_second = self.parent.get_pixels_per_second()
@@ -248,9 +238,6 @@ class track:
def on_visible_click (self, item, target, event):
- # get a reference to the language translate method
- _ = self.parent.project.translate
-
# get the parent left group
parent_group = item.get_parent()
@@ -281,9 +268,6 @@ class track:
def on_audio_click (self, item, target, event):
- # get a reference to the language translate method
- _ = self.parent.project.translate
-
# get the parent left group
parent_group = item.get_parent()
--- openshot-1.3.0.orig/openshot/classes/files.py
+++ openshot-1.3.0/openshot/classes/files.py
@@ -20,9 +20,6 @@ from classes import messagebox
import os, sys, urllib, uuid, re
import gtk
-# init the foreign language
-from language import Language_Init
-
########################################################################
class OpenShotFile:
"""The generic file object for OpenShot"""
@@ -33,10 +30,6 @@ class OpenShotFile:
"""Constructor"""
- # Add language support
- translator = Language_Init.Translator(self.project)
- _ = translator.lang.gettext
-
# init the variables for the File Object
self.name = "" # short / friendly name of the file
self.length = 0.0 # length in seconds
--- openshot-1.3.0.orig/openshot/classes/av_formats.py
+++ openshot-1.3.0/openshot/classes/av_formats.py
@@ -30,9 +30,6 @@ try:
except ImportError:
print "*** ERROR: MLT Python bindings failed to import ***"
-# init the foreign language
-from language import Language_Init
-
class formats:
--- openshot-1.3.0.orig/openshot/classes/video.py
+++ openshot-1.3.0/openshot/classes/video.py
@@ -21,9 +21,6 @@ import threading
import gobject
from classes import profiles
-# init the foreign language
-from language import Language_Init
-
try:
import mlt
except ImportError:
@@ -37,10 +34,6 @@ class player ( threading.Thread ):
self.main_form = main_form
self.file_name = file_name
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
# set the FPS
self.fps = self.project.fps()
@@ -98,9 +91,6 @@ class player ( threading.Thread ):
def load_xml(self):
-
- # get reference to translate gettext method
- _ = self._
# re-init the mlt factory
mlt.Factory.init()
--- openshot-1.3.0.orig/openshot/classes/sequences.py
+++ openshot-1.3.0/openshot/classes/sequences.py
@@ -21,8 +21,6 @@ import gtk, goocanvas
import xml.dom.minidom as xml
from classes import clip, files, marker, timeline, track
-# init the foreign language
-from language import Language_Init
########################################################################
class sequence:
@@ -32,10 +30,6 @@ class sequence:
#----------------------------------------------------------------------
def __init__(self, seq_name, project):
"""Constructor"""
-
- # Add language support
- translator = Language_Init.Translator(project)
- _ = translator.lang.gettext
# init variables for sequence
self.name = seq_name
--- openshot-1.3.0.orig/openshot/classes/cli_render.py
+++ openshot-1.3.0/openshot/classes/cli_render.py
@@ -56,11 +56,10 @@ class Bot():
if init_threads:
# Add language support
- translator = Language_Init.Translator(self)
- _ = translator.lang.gettext
+ translator = Language_Init.Translator()
# use OptionParser to interpret commandline options
- parser = OptionParser(_("usage: %prog [options] inputfile.osp"))
+ parser = OptionParser(_("%prog [options] inputfile.osp"))
parser.add_option("-o",
"--outputfile",
dest="FileName",
--- openshot-1.3.0.orig/openshot/uploads/manager.py
+++ openshot-1.3.0/openshot/uploads/manager.py
@@ -4,9 +4,6 @@ import os, sys
from classes import messagebox
from vimeo import VimeoClient
-# init the foreign language
-from language import Language_Init
-
class UploadManager():
def __init__(self, project, settings):
@@ -27,10 +24,6 @@ class YouTubeService():
self.settings = settings
self.form = None
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
def initialize(self, form):
""" Prepare the upload form for this service """
self.form = form
@@ -53,9 +46,6 @@ class YouTubeService():
def get_export_presets(self):
""" Get a tuple of related export presets for this service (if any) """
- # get reference to gettext
- _ = self._
-
return (_("Web"), _("YouTube-HD"))
def get_authorization_url(self):
@@ -68,9 +58,6 @@ class YouTubeService():
def validate(self, form):
""" Validate the upload form... check for missing values. """
- # get reference to gettext
- _ = self._
-
# get settings
title = form.txtTitle.get_text()
start, end = form.txtDescription.get_buffer().get_bounds()
@@ -115,9 +102,6 @@ class YouTubeService():
def start_upload(self, form):
- # get reference to gettext
- _ = self._
-
# Get the absolute path of this project
import os, sys
google_api_path = os.path.join(self.project.BASE_DIR, "openshot", "uploads", "youtube")
@@ -219,10 +203,6 @@ class VimeoService():
self.verifier = None
self.form = None
- # Add language support
- _ = Language_Init.Translator(project).lang.gettext
- self._ = _
-
# get tokens (if already authorized)
if self.settings.app_state["vimeo_token"]:
self.token = self.settings.app_state["vimeo_token"]
@@ -280,9 +260,6 @@ class VimeoService():
def get_export_presets(self):
""" Get a tuple of related export presets for this service (if any) """
- # get reference to gettext
- _ = self._
-
return (_("Web"), _("Vimeo-HD"))
def get_authorization_url(self):
@@ -293,9 +270,6 @@ class VimeoService():
def validate(self, form):
""" Validate the upload form... check for missing values. """
- # get reference to gettext
- _ = self._
-
# get code
verification_code = form.txtVerification.get_text()
title = form.txtTitle.get_text()
@@ -332,9 +306,6 @@ class VimeoService():
def start_upload(self, form):
- # get reference to gettext
- _ = self._
-
if not self.token:
# Not Authorized Yet.
# get code