Skip to content

Commit

Permalink
Merge pull request #59 from tobias47n9e/master
Browse files Browse the repository at this point in the history 
Merge i18n and l10n fixes and updates
  • Loading branch information
@tobias47n9e
tobias47n9e committed Aug 22, 2015
2 parents a8ebba5 + ebc08ea commit f07fe39
Show file tree
Hide file tree
Showing 11 changed files with 879 additions and 809 deletions.
36 changes: 19 additions & 17 deletions innstereo/dataview_classes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
"""

from gi.repository import Gtk, Gdk, GLib
from .i18n import i18n

_ = i18n().language().gettext

class DataTreeView(Gtk.TreeView):

Expand Down Expand Up @@ -200,7 +202,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_dir = Gtk.CellRendererText()
renderer_dir.set_property("editable", True)
column_dir = Gtk.TreeViewColumn("Dir", renderer_dir, text=0)
column_dir = Gtk.TreeViewColumn(_("Dir"), renderer_dir, text=0)
column_dir.set_alignment(0.5)
column_dir.set_expand(True)
column_dir.set_cell_data_func(renderer_dir,
Expand All @@ -211,7 +213,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_dip = Gtk.CellRendererText()
renderer_dip.set_property("editable", True)
column_dip = Gtk.TreeViewColumn("Dip", renderer_dip, text=1)
column_dip = Gtk.TreeViewColumn(_("Dip"), renderer_dip, text=1)
column_dip.set_alignment(0.5)
column_dip.set_expand(True)
column_dip.set_cell_data_func(renderer_dip,
Expand All @@ -222,7 +224,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_strat = Gtk.CellRendererText()
renderer_strat.set_property("editable", True)
column_strat = Gtk.TreeViewColumn("Strat", renderer_strat, text=2)
column_strat = Gtk.TreeViewColumn(_("Strat"), renderer_strat, text=2)
column_strat.set_alignment(0.5)
column_strat.set_expand(True)
self.append_column(column_strat)
Expand Down Expand Up @@ -289,7 +291,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_dir = Gtk.CellRendererText()
renderer_dir.set_property("editable", True)
column_dir = Gtk.TreeViewColumn("Dir", renderer_dir, text=0)
column_dir = Gtk.TreeViewColumn(_("Dir"), renderer_dir, text=0)
column_dir.set_alignment(0.5)
column_dir.set_expand(True)
column_dir.set_cell_data_func(renderer_dir,
Expand All @@ -300,7 +302,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_dip = Gtk.CellRendererText()
renderer_dip.set_property("editable", True)
column_dip = Gtk.TreeViewColumn("Dip", renderer_dip, text=1)
column_dip = Gtk.TreeViewColumn(_("Dip"), renderer_dip, text=1)
column_dip.set_alignment(0.5)
column_dip.set_expand(True)
column_dip.set_cell_data_func(renderer_dip,
Expand All @@ -311,7 +313,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_ldir = Gtk.CellRendererText()
renderer_ldir.set_property("editable", True)
column_ldir = Gtk.TreeViewColumn("L-Dir", renderer_ldir, text=2)
column_ldir = Gtk.TreeViewColumn(_("L-Dir"), renderer_ldir, text=2)
column_ldir.set_alignment(0.5)
column_ldir.set_expand(True)
column_ldir.set_cell_data_func(renderer_ldir,
Expand All @@ -322,7 +324,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_ldip = Gtk.CellRendererText()
renderer_ldip.set_property("editable", True)
column_ldip = Gtk.TreeViewColumn("L-Dip", renderer_ldip, text=3)
column_ldip = Gtk.TreeViewColumn(_("L-Dip"), renderer_ldip, text=3)
column_ldip.set_alignment(0.5)
column_ldip.set_expand(True)
column_ldip.set_cell_data_func(renderer_ldip,
Expand All @@ -334,7 +336,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):
renderer_sense = Gtk.CellRendererText()
renderer_sense.set_property("editable", True)
renderer_sense.set_property("placeholder-text", "up/dn/sin/dex/uk")
column_sense = Gtk.TreeViewColumn("Sense", renderer_sense, text=4)
column_sense = Gtk.TreeViewColumn(_("Sense"), renderer_sense, text=4)
column_sense.set_alignment(0.5)
column_sense.set_expand(True)
self.append_column(column_sense)
Expand Down Expand Up @@ -436,7 +438,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_dir = Gtk.CellRendererText()
renderer_dir.set_property("editable", True)
column_dir = Gtk.TreeViewColumn("Dir", renderer_dir, text=0)
column_dir = Gtk.TreeViewColumn(_("Dir"), renderer_dir, text=0)
column_dir.set_alignment(0.5)
column_dir.set_expand(True)
column_dir.set_cell_data_func(renderer_dir,
Expand All @@ -447,7 +449,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_dip = Gtk.CellRendererText()
renderer_dip.set_property("editable", True)
column_dip = Gtk.TreeViewColumn("Dip", renderer_dip, text=1)
column_dip = Gtk.TreeViewColumn(_("Dip"), renderer_dip, text=1)
column_dip.set_alignment(0.5)
column_dip.set_expand(True)
column_dip.set_cell_data_func(renderer_dip,
Expand All @@ -459,7 +461,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):
renderer_sense = Gtk.CellRendererText()
renderer_sense.set_property("editable", True)
renderer_sense.set_property("placeholder-text", "up/dn/sin/dex/uk")
column_sense = Gtk.TreeViewColumn("Sense", renderer_sense, text=2)
column_sense = Gtk.TreeViewColumn(_("Sense"), renderer_sense, text=2)
column_sense.set_alignment(0.5)
column_sense.set_expand(True)
self.append_column(column_sense)
Expand Down Expand Up @@ -530,7 +532,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_dir = Gtk.CellRendererText()
renderer_dir.set_property("editable", True)
column_dir = Gtk.TreeViewColumn("Dir", renderer_dir, text=0)
column_dir = Gtk.TreeViewColumn(_("Dir"), renderer_dir, text=0)
column_dir.set_alignment(0.5)
column_dir.set_expand(True)
column_dir.set_cell_data_func(renderer_dir,
Expand All @@ -541,7 +543,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_dip = Gtk.CellRendererText()
renderer_dip.set_property("editable", True)
column_dip = Gtk.TreeViewColumn("Dip", renderer_dip, text=1)
column_dip = Gtk.TreeViewColumn(_("Dip"), renderer_dip, text=1)
column_dip.set_alignment(0.5)
column_dip.set_expand(True)
column_dip.set_cell_data_func(renderer_dip,
Expand All @@ -552,7 +554,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_angle = Gtk.CellRendererText()
renderer_angle.set_property("editable", True)
column_angle = Gtk.TreeViewColumn("Angle", renderer_angle, text=2)
column_angle = Gtk.TreeViewColumn(_("Angle"), renderer_angle, text=2)
column_angle.set_alignment(0.5)
column_angle.set_expand(True)
column_angle.set_cell_data_func(renderer_angle,
Expand Down Expand Up @@ -630,7 +632,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_dir = Gtk.CellRendererText()
renderer_dir.set_property("editable", True)
column_dir = Gtk.TreeViewColumn("Dir", renderer_dir, text=0)
column_dir = Gtk.TreeViewColumn(_("Dir"), renderer_dir, text=0)
column_dir.set_alignment(0.5)
column_dir.set_expand(True)
column_dir.set_cell_data_func(renderer_dir,
Expand All @@ -641,7 +643,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_dip = Gtk.CellRendererText()
renderer_dip.set_property("editable", True)
column_dip = Gtk.TreeViewColumn("Dip", renderer_dip, text=1)
column_dip = Gtk.TreeViewColumn(_("Dip"), renderer_dip, text=1)
column_dip.set_alignment(0.5)
column_dip.set_expand(True)
column_dip.set_cell_data_func(renderer_dip,
Expand All @@ -652,7 +654,7 @@ def __init__(self, store, redraw_plot, add_feature, settings):

renderer_value = Gtk.CellRendererText()
renderer_value.set_property("editable", True)
column_value = Gtk.TreeViewColumn("Eigenvalue", renderer_value, text=2)
column_value = Gtk.TreeViewColumn(_("Eigenvalue"), renderer_value, text=2)
column_value.set_alignment(0.5)
column_value.set_expand(True)
column_value.set_cell_data_func(renderer_value,
Expand Down
8 changes: 8 additions & 0 deletions innstereo/dialog_windows.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from gi.repository import Gtk
import matplotlib.colors as colors
import os
from .i18n import i18n


class AboutDialog(object):
Expand All @@ -31,6 +32,7 @@ def __init__(self, main_window):
are declared in the Glade file are connected to this class.
"""
self.builder = Gtk.Builder()
self.builder.set_translation_domain(i18n().get_ts_domain())
script_dir = os.path.dirname(__file__)
rel_path = "gui_layout.glade"
abs_path = os.path.join(script_dir, rel_path)
Expand Down Expand Up @@ -89,6 +91,7 @@ def __init__(self, settings, redraw_function, main_window, change_night_mode):
window.
"""
self.builder = Gtk.Builder()
self.builder.set_translation_domain(i18n().get_ts_domain())
script_dir = os.path.dirname(__file__)
rel_path = "gui_layout.glade"
abs_path = os.path.join(script_dir, rel_path)
Expand Down Expand Up @@ -308,6 +311,7 @@ class FileChooserParse(object):

def __init__(self, run_file_parser, main_window):
self.builder = Gtk.Builder()
self.builder.set_translation_domain(i18n().get_ts_domain())
script_dir = os.path.dirname(__file__)
rel_path = "gui_layout.glade"
abs_path = os.path.join(script_dir, rel_path)
Expand Down Expand Up @@ -391,6 +395,7 @@ class FileChooserExport(object):

def __init__(self, export_data, main_window):
self.builder = Gtk.Builder()
self.builder.set_translation_domain(i18n().get_ts_domain())
self.export_data = export_data
script_dir = os.path.dirname(__file__)
rel_path = "gui_layout.glade"
Expand Down Expand Up @@ -488,6 +493,7 @@ class OverwriteDialog(object):

def __init__(self, call_overwrite, export_dialog):
self.builder = Gtk.Builder()
self.builder.set_translation_domain(i18n().get_ts_domain())
self.call_overwrite = call_overwrite
script_dir = os.path.dirname(__file__)
rel_path = "gui_layout.glade"
Expand Down Expand Up @@ -540,6 +546,7 @@ class FileChooserSave(object):

def __init__(self, main_window, data):
self.builder = Gtk.Builder()
self.builder.set_translation_domain(i18n().get_ts_domain())
self.data = data
script_dir = os.path.dirname(__file__)
rel_path = "gui_layout.glade"
Expand Down Expand Up @@ -636,6 +643,7 @@ class FileChooserOpen(object):

def __init__(self, main_window, open_project):
self.builder = Gtk.Builder()
self.builder.set_translation_domain(i18n().get_ts_domain())
script_dir = os.path.dirname(__file__)
rel_path = "gui_layout.glade"
abs_path = os.path.join(script_dir, rel_path)
Expand Down

0 comments on commit f07fe39

Please sign in to comment.