Changeset 3335d5a61a4a…
Parent 01b1f48bd9e1…
by
Changes to 3 files · Browse files at 3335d5a61a4a Showing diff from parent 01b1f48bd9e1 Diff from another changeset...
@@ -81,6 +81,8 @@ ## use English backout message option
self.eng_msg = gtk.CheckButton(_('Use English backout message'))
self.eng_msg.connect('toggled', self.eng_msg_toggled)
+ engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False)
+ self.eng_msg.set_active(engmsg)
hbox.pack_start(self.eng_msg, False, False)
## merge after backout
@@ -116,14 +118,10 @@ self.cmd.set_result(_('Failed to backout'), style='error')
def load_settings(self):
- checked = self.settings.get_value('english', False, True)
- self.eng_msg.set_active(checked)
checked = self.settings.get_value('merge', True, True)
self.merge_button.set_active(checked)
def store_settings(self):
- checked = self.eng_msg.get_active()
- self.settings.set_value('english', checked)
checked = self.merge_button.get_active()
self.settings.set_value('merge', checked)
self.settings.write()
|
@@ -79,6 +79,8 @@ self.replacechk.connect('toggled',
lambda *a: self.update_sensitives())
self.engchk = gtk.CheckButton(_('Use English commit message'))
+ engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False)
+ self.engchk.set_active(engmsg)
table.add_row(self.localchk)
table.add_row(self.replacechk)
table.add_row(self.engchk)
@@ -157,16 +159,10 @@ expanded = self.settings.get_value('expanded', False, True)
self.expander.set_property('expanded', expanded)
- checked = self.settings.get_value('english', False, True)
- self.engchk.set_active(checked)
-
def store_settings(self):
expanded = self.expander.get_property('expanded')
self.settings.set_value('expanded', expanded)
- checked = self.engchk.get_active()
- self.settings.set_value('english', checked)
-
self.settings.write()
def local_tag_toggled(self, checkbutton):
|
@@ -94,6 +94,11 @@ _('Comma separated list of files that are automatically unchecked'
' when the status, commit, and shelve dialogs are opened.'
' Default: None')),
+ (_('English Message'), 'tortoisehg.engmsg', ['False', 'True'],
+ _('Use English commit message even if LANGUAGE or LANG environment'
+ ' variables are set to any language other than English.'
+ ' This setting is used in Merge/Tag/Backout dialog.'
+ ' Default: False')),
)),
({'name': 'log', 'label': _('Repository Explorer'),
|
Loading...