From 5cb78127f552a06aa6a398661b96fe396f302606 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Mon, 07 Oct 2013 23:23:18 +0000 Subject: add i18n to palette names --- diff --git a/TurtleArt/tabasics.py b/TurtleArt/tabasics.py index beccd2a..667486f 100644 --- a/TurtleArt/tabasics.py +++ b/TurtleArt/tabasics.py @@ -119,7 +119,7 @@ class Palettes(): def _turtle_palette(self): ''' The basic Turtle Art turtle palette ''' - palette = make_palette('turtle', + palette = make_palette(_('turtle'), colors=["#00FF00", "#00A000"], help_string=_('Palette of turtle commands')) @@ -303,7 +303,7 @@ setxy :x :y\npendown\nend\n') def _pen_palette(self): ''' The basic Turtle Art pen palette ''' - palette = make_palette('pen', + palette = make_palette(_('pen'), colors=["#00FFFF", "#00A0A0"], help_string=_('Palette of pen commands')) @@ -503,7 +503,7 @@ pensize\nend\n') def _color_palette(self): ''' The basic Turtle Art color palette ''' - palette = make_palette('colors', + palette = make_palette(_('colors'), colors=["#00FFFF", "#00A0A0"], help_string=_('Palette of pen colors')) @@ -596,7 +596,7 @@ tasetshade :shade \n') def _numbers_palette(self): ''' The basic Turtle Art numbers palette ''' - palette = make_palette('numbers', + palette = make_palette(_('numbers'), colors=["#FF00FF", "#A000A0"], help_string=_('Palette of numeric operators')) @@ -779,7 +779,7 @@ operators')) def _flow_palette(self): ''' The basic Turtle Art flow palette ''' - palette = make_palette('flow', + palette = make_palette(_('flow'), colors=["#FFC000", "#A08000"], help_string=_('Palette of flow operators')) @@ -879,7 +879,7 @@ boolean operators from Numbers palette')) def _blocks_palette(self): ''' The basic Turtle Art blocks palette ''' - palette = make_palette('blocks', + palette = make_palette(_('blocks'), colors=["#FFFF00", "#A0A000"], help_string=_('Palette of variable blocks')) @@ -1040,7 +1040,7 @@ variable')) def _trash_palette(self): ''' The basic Turtle Art turtle palette ''' - palette = make_palette('trash', + palette = make_palette(_('trash'), colors=["#FFFF00", "#A0A000"], help_string=_('trash')) diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index af611a3..5f7ffde 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -1002,7 +1002,8 @@ class TurtleArtWindow(): self.running_sugar) else: blk.spr.hide() - if 'trash' in palette_names and n == palette_names.index('trash'): + if _('trash') in palette_names and \ + n == palette_names.index(_('trash')): for blk in self.trash_stack: # Deprecated for gblk in find_group(blk): @@ -1278,8 +1279,8 @@ class TurtleArtWindow(): and not self.activity.has_toolbarbox: self.activity.palette_buttons[palette].set_icon( palette_names[palette] + 'off') - if 'trash' in palette_names and \ - palette == palette_names.index('trash'): + if _('trash') in palette_names and \ + palette == palette_names.index(_('trash')): for blk in self.trash_stack: for gblk in find_group(blk): gblk.spr.hide() @@ -1359,8 +1360,8 @@ class TurtleArtWindow(): if self.orientation == HORIZONTAL_PALETTE: x, y = _BUTTON_SIZE, self.toolbar_offset + _MARGIN x, y, max_w = self._horizontal_layout(x, y, self.palettes[n]) - if 'trash' in palette_names and \ - n == palette_names.index('trash'): + if _('trash') in palette_names and \ + n == palette_names.index(_('trash')): x, y, max_w = self._horizontal_layout(x + max_w, y, self.trash_stack) w = x + max_w + _BUTTON_SIZE + _MARGIN @@ -1376,8 +1377,8 @@ class TurtleArtWindow(): else: x, y = _MARGIN, self.toolbar_offset + _BUTTON_SIZE + _MARGIN x, y, max_h = self._vertical_layout(x, y, self.palettes[n]) - if 'trash' in palette_names and \ - n == palette_names.index('trash'): + if _('trash') in palette_names and \ + n == palette_names.index(_('trash')): x, y, max_h = self._vertical_layout(x, y + max_h, self.trash_stack) h = y + max_h + _BUTTON_SIZE + _MARGIN - self.toolbar_offset @@ -1422,8 +1423,8 @@ class TurtleArtWindow(): 'category-shift-vertical' else: self.palette_sprs[n][self.orientation].type = 'category' - if 'trash' in palette_names and \ - n == palette_names.index('trash'): + if _('trash') in palette_names and \ + n == palette_names.index(_('trash')): svg = SVG() self.palette_sprs[n][self.orientation].set_shape( svg_str_to_pixbuf(svg.palette(w, h))) @@ -1569,8 +1570,9 @@ before making changes to your program')) self._put_in_trash(b1) else: self._put_in_trash(find_top_block(b)) - self.show_toolbar_palette(palette_names.index('trash'), - regenerate=True) + if _('trash') in palette_names: + self.show_toolbar_palette( + palette_names.index(_('trash')), regenerate=True) elif blk.name in MACROS: self.new_macro(blk.name, x + 20, y + 20) else: @@ -2010,8 +2012,8 @@ before making changes to your program')) if gblk.name in BLOCKS_WITH_SKIN: self._resize_skin(gblk) - if not 'trash' in palette_names or \ - self.selected_palette != palette_names.index('trash'): + if not _('trash') in palette_names or \ + self.selected_palette != palette_names.index(_('trash')): for gblk in group: gblk.spr.hide() @@ -2117,8 +2119,9 @@ before making changes to your program')) blk.type = 'deleted' blk.spr.hide() self.trash_stack = [] - self.show_toolbar_palette(palette_names.index('trash'), - regenerate=True) + if _('trash') in palette_names: + self.show_toolbar_palette(palette_names.index(_('trash')), + regenerate=True) def _in_the_trash(self, x, y): ''' Is x, y over a palette? ''' @@ -4572,7 +4575,7 @@ before making changes to your program')) if name == _('action'): return # Choose a palette for the new block. - palette = make_palette('blocks') + palette = make_palette(_('blocks')) # Create a new block prototype. primitive_dictionary['stack'] = self._prim_stack @@ -4601,7 +4604,7 @@ before making changes to your program')) if name == _('my box'): return # Choose a palette for the new block. - palette = make_palette('blocks') + palette = make_palette(_('blocks')) # Create a new block prototype. primitive_dictionary['box'] = self._prim_box @@ -4631,7 +4634,7 @@ before making changes to your program')) if name == _('my box'): return # Choose a palette for the new block. - palette = make_palette('blocks') + palette = make_palette(_('blocks')) # Create a new block prototype. primitive_dictionary['setbox'] = self._prim_setbox diff --git a/plugins/accelerometer/accelerometer.py b/plugins/accelerometer/accelerometer.py index 26aefd4..36ffa3e 100644 --- a/plugins/accelerometer/accelerometer.py +++ b/plugins/accelerometer/accelerometer.py @@ -44,7 +44,7 @@ class Accelerometer(Plugin): def setup(self): # set up accelerometer specific blocks - palette = make_palette('sensor', + palette = make_palette(_('sensor'), colors=["#FF6060", "#A06060"], help_string=_('Palette of sensor blocks'), position=6) diff --git a/plugins/audio_sensors/audio_sensors.py b/plugins/audio_sensors/audio_sensors.py index 8d45395..e49e471 100644 --- a/plugins/audio_sensors/audio_sensors.py +++ b/plugins/audio_sensors/audio_sensors.py @@ -70,7 +70,7 @@ class Audio_sensors(Plugin): self.ringbuffer = [] - palette = make_palette('sensor', + palette = make_palette(_('sensor'), colors=["#FF6060", "#A06060"], help_string=_('Palette of sensor blocks'), position=6) diff --git a/plugins/camera_sensor/camera_sensor.py b/plugins/camera_sensor/camera_sensor.py index 6509a88..5d4b2a9 100644 --- a/plugins/camera_sensor/camera_sensor.py +++ b/plugins/camera_sensor/camera_sensor.py @@ -57,12 +57,12 @@ class Camera_sensor(Plugin): def setup(self): ''' Set up the palettes ''' - sensors_palette = make_palette('sensor', + sensors_palette = make_palette(_('sensor'), colors=["#FF6060", "#A06060"], help_string=_( 'Palette of sensor blocks'), position=6) - media_palette = make_palette('media', + media_palette = make_palette(_('media'), colors=["#A0FF00", "#80A000"], help_string=_('Palette of media objects'), position=7) diff --git a/plugins/light_sensor/light_sensor.py b/plugins/light_sensor/light_sensor.py index bd5655e..506aaaf 100644 --- a/plugins/light_sensor/light_sensor.py +++ b/plugins/light_sensor/light_sensor.py @@ -44,7 +44,7 @@ class Light_sensor(Plugin): def setup(self): # set up light-sensor specific blocks - palette = make_palette('sensor', + palette = make_palette(_('sensor'), colors=["#FF6060", "#A06060"], help_string=_('Palette of sensor blocks'), position=6) diff --git a/plugins/rfid/rfid.py b/plugins/rfid/rfid.py index de96a1f..a1b9613 100644 --- a/plugins/rfid/rfid.py +++ b/plugins/rfid/rfid.py @@ -81,7 +81,7 @@ class Rfid(Plugin): def setup(self): # set up RFID-specific blocks primitive_dictionary['rfid'] = self.prim_read_rfid - palette = make_palette('sensor', + palette = make_palette(_('sensor'), colors=["#FF6060", "#A06060"], help_string=_('Palette of sensor blocks'), position=6) diff --git a/plugins/turtle_blocks_extras/turtle_blocks_extras.py b/plugins/turtle_blocks_extras/turtle_blocks_extras.py index a0fa6c3..c3a2667 100644 --- a/plugins/turtle_blocks_extras/turtle_blocks_extras.py +++ b/plugins/turtle_blocks_extras/turtle_blocks_extras.py @@ -86,7 +86,7 @@ class Turtle_blocks_extras(Plugin): # Palette definitions def _flow_palette(self): - palette = make_palette('flow', + palette = make_palette(_('flow'), colors=["#FFC000", "#A08000"], help_string=_('Palette of flow operators')) @@ -120,7 +120,7 @@ boolean operators from Numbers palette')) self.tw.lc.def_prim('clamp', 1, primitive_dictionary['clamp'], True) def _media_palette(self): - palette = make_palette('media', + palette = make_palette(_('media'), colors=["#A0FF00", "#80A000"], help_string=_('Palette of media objects'), position=7) @@ -304,7 +304,7 @@ amplitude, and duration (in seconds)')) primitive_dictionary['sinewave'](x, y, z)) def _sensor_palette(self): - palette = make_palette('sensor', + palette = make_palette(_('sensor'), colors=["#FF6060", "#A06060"], help_string=_('Palette of sensor blocks'), position=6) @@ -431,7 +431,7 @@ program started')) lambda self: primitive_dictionary['time']()) def _extras_palette(self): - palette = make_palette('extras', + palette = make_palette(_('extras'), colors=["#FF0000", "#A00000"], help_string=_('Palette of extra options'), position=8) @@ -783,7 +783,7 @@ module found in the Journal')) palette.add_block('loadpalette', style='basic-style-1arg', string_or_number=True, - label=_('palette'), + label=_('select palette'), prim_name='loadpalette', default=_('turtle'), help_string=_('selects a palette')) @@ -792,7 +792,7 @@ module found in the Journal')) primitive_dictionary['loadpalette'](x)) def _portfolio_palette(self): - palette = make_palette('portfolio', + palette = make_palette(_('portfolio'), colors=["#0606FF", "#0606A0"], help_string=_('Palette of presentation \ templates'), @@ -993,7 +993,7 @@ Journal objects')) debug_output('making myblocks palette', self.tw.running_sugar) if len(files) > 0: palette = make_palette( - 'myblocks', + _('myblocks'), colors=["#FFFF00", "#A0A000"], help_string=_('Palette of user-defined operators')) -- cgit v0.9.1