diff options
-rw-r--r-- | TurtleArt/tabasics.py | 2 | ||||
-rw-r--r-- | TurtleArt/tablock.py | 2 | ||||
-rw-r--r-- | TurtleArt/taconstants.py | 2 | ||||
-rwxr-xr-x | TurtleArt/tasprite_factory.py | 1 | ||||
-rw-r--r-- | TurtleArt/tautils.py | 1 | ||||
-rw-r--r-- | TurtleArt/tawindow.py | 1 | ||||
-rw-r--r-- | TurtleArtActivity.py | 4 | ||||
-rw-r--r-- | plugins/audio_sensors_plugin.py | 2 | ||||
-rw-r--r-- | plugins/camera_plugin.py | 2 | ||||
-rw-r--r-- | plugins/rfid_plugin.py | 2 | ||||
-rw-r--r-- | plugins/turtle_blocks_plugin.py | 1 | ||||
-rwxr-xr-x | turtleart.py | 10 |
12 files changed, 5 insertions, 25 deletions
diff --git a/TurtleArt/tabasics.py b/TurtleArt/tabasics.py index b4780d9..d6dc5e8 100644 --- a/TurtleArt/tabasics.py +++ b/TurtleArt/tabasics.py @@ -62,8 +62,6 @@ from time import time from math import sqrt from random import uniform -from gettext import gettext as _ - from tapalette import make_palette from talogo import primitive_dictionary, logoerror from tautils import convert, chr_to_ord, round_int, strtype diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py index 165ee10..243c29f 100644 --- a/TurtleArt/tablock.py +++ b/TurtleArt/tablock.py @@ -21,8 +21,6 @@ import gtk -from gettext import gettext as _ - from taconstants import EXPANDABLE, EXPANDABLE_ARGS, OLD_NAMES, CONSTANTS, \ STANDARD_STROKE_WIDTH, BLOCK_SCALE, BOX_COLORS, GRADIENT_COLOR from tapalette import palette_blocks, block_colors, expandable_blocks, \ diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py index 54c2d27..c3a5d14 100644 --- a/TurtleArt/taconstants.py +++ b/TurtleArt/taconstants.py @@ -19,8 +19,6 @@ #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN #THE SOFTWARE. -from gettext import gettext as _ - # # Sprite layers # diff --git a/TurtleArt/tasprite_factory.py b/TurtleArt/tasprite_factory.py index ea72213..c9fc4c4 100755 --- a/TurtleArt/tasprite_factory.py +++ b/TurtleArt/tasprite_factory.py @@ -24,7 +24,6 @@ import pygtk pygtk.require('2.0') import gtk import os -from gettext import gettext as _ from taconstants import HIT_RED, HIT_GREEN, HIDE_WHITE, SHOW_WHITE diff --git a/TurtleArt/tautils.py b/TurtleArt/tautils.py index 23f0080..ee7a6b1 100644 --- a/TurtleArt/tautils.py +++ b/TurtleArt/tautils.py @@ -42,7 +42,6 @@ from taconstants import HIDE_LAYER, COLLAPSIBLE, BLOCK_LAYER, HIT_HIDE, \ HIT_SHOW, XO1, XO15, UNKNOWN from StringIO import StringIO import os.path -from gettext import gettext as _ import logging _logger = logging.getLogger('turtleart-activity') diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index d83b9b7..fc2f020 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -42,7 +42,6 @@ from math import atan2, pi DEGTOR = 2 * pi / 360 import locale -from gettext import gettext as _ try: from sugar.datastore import datastore diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index b36a051..8614fb8 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -39,10 +39,12 @@ from sugar.graphics.toolbutton import ToolButton from sugar.datastore import datastore from sugar import profile -from gettext import gettext as _ import os.path import tarfile +# installs the global _() magic +import TurtleArt.tagettext + from TurtleArt.tapalette import palette_names, help_strings from TurtleArt.taconstants import OVERLAY_LAYER, ICON_SIZE, BLOCK_SCALE from TurtleArt.taexporthtml import save_html diff --git a/plugins/audio_sensors_plugin.py b/plugins/audio_sensors_plugin.py index 89fd9e1..3b1cc9b 100644 --- a/plugins/audio_sensors_plugin.py +++ b/plugins/audio_sensors_plugin.py @@ -22,8 +22,6 @@ try: except: PITCH_AVAILABLE = False -from gettext import gettext as _ - from plugin import Plugin from plugins.lib.audio.audiograb import AudioGrab_Unknown, AudioGrab_XO1, \ diff --git a/plugins/camera_plugin.py b/plugins/camera_plugin.py index dd22a7e..f5beb62 100644 --- a/plugins/camera_plugin.py +++ b/plugins/camera_plugin.py @@ -19,8 +19,6 @@ import gst import gtk from fcntl import ioctl -from gettext import gettext as _ - from lib.camera.tacamera import Camera from lib.camera.v4l2 import v4l2_control, V4L2_CID_AUTOGAIN, VIDIOC_G_CTRL, \ VIDIOC_S_CTRL diff --git a/plugins/rfid_plugin.py b/plugins/rfid_plugin.py index 04b6f35..a2aaf68 100644 --- a/plugins/rfid_plugin.py +++ b/plugins/rfid_plugin.py @@ -17,8 +17,6 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import dbus - -from gettext import gettext as _ from dbus.mainloop.glib import DBusGMainLoop from lib.rfid.rfidutils import strhex2bin, strbin2dec, find_device diff --git a/plugins/turtle_blocks_plugin.py b/plugins/turtle_blocks_plugin.py index f513b64..ba2e45f 100644 --- a/plugins/turtle_blocks_plugin.py +++ b/plugins/turtle_blocks_plugin.py @@ -18,7 +18,6 @@ import gtk from time import time import os.path -from gettext import gettext as _ try: from sugar.datastore import datastore diff --git a/turtleart.py b/turtleart.py index ea3a784..9ef87a1 100755 --- a/turtleart.py +++ b/turtleart.py @@ -43,14 +43,8 @@ except ImportError, e: argv = sys.argv[:] # Workaround for import behavior of gst in tagplay sys.argv[1:] = [] # Execution of import gst cannot see '--help' or '-h' -import gettext - -# Commenting out bindtextdomain so that GNOME can find the installed .mo files, -# but it will not find the .mo files in the local locale directory when running -# from a git repository or the unzipped .xo file. -# gettext.bindtextdomain('org.laptop.TurtleArtActivity', 'locale') -gettext.textdomain('org.laptop.TurtleArtActivity') -_ = gettext.gettext +# installs the global _() magic +import TurtleArt.tagettext from TurtleArt.taconstants import OVERLAY_LAYER, DEFAULT_TURTLE_COLORS from TurtleArt.tautils import data_to_string, data_from_string, get_save_name |