wizard texts on failure success are now pangoed and look nicer. also no more hardcoding \n and using word wrap; making translators life easier by ommiting some \n etc

This commit is contained in:
Nikos Kouremenos 2005-11-09 17:08:09 +00:00
parent 6649b62f03
commit f466590c7b
2 changed files with 17 additions and 17 deletions

View file

@ -2570,10 +2570,10 @@ class AccountCreationWizardWindow:
self.back_button.hide() self.back_button.hide()
self.forward_button.hide() self.forward_button.hide()
if self.modify: if self.modify:
#FIXME: pango me finish_text = '<big><b>%s</b></big>\n\n%s' % (
finish_text = _('Account has been added successfully.\n' _('Account has been added successfully'),
'You can set advanced account options by pressing Advanced button,\nor later by clicking in Accounts menuitem under Edit menu from the main window.') _('You can set advanced account options by pressing Advanced button, or later by clicking in Accounts menuitem under Edit menu from the main window.'))
self.finish_label.set_text(finish_text) self.finish_label.set_markup(finish_text)
self.finish_button.set_sensitive(True) self.finish_button.set_sensitive(True)
self.finish_button.set_property('has-default', True) self.finish_button.set_property('has-default', True)
self.advanced_button.show() self.advanced_button.show()
@ -2601,10 +2601,11 @@ class AccountCreationWizardWindow:
self.go_online_checkbutton.show() self.go_online_checkbutton.show()
img = self.xml.get_widget('finish_image') img = self.xml.get_widget('finish_image')
img.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_DIALOG) img.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_DIALOG)
#FIXME: pango me
finish_text = _('Your new account has been created successfully.\n' finish_text = '<big><b>%s</b></big>\n\n%s' % (
'You can set advanced account options by pressing Advanced button,\nor later by clicking in Accounts menuitem under Edit menu from the main window.') _('Your new account has been created successfully'),
self.finish_label.set_text(finish_text) _('You can set advanced account options by pressing Advanced button,or later by clicking in Accounts menuitem under Edit menu from the main window.'))
self.finish_label.set_markup(finish_text)
self.notebook.set_current_page(3) # show finish page self.notebook.set_current_page(3) # show finish page
if self.update_progressbar_timeout_id is not None: if self.update_progressbar_timeout_id is not None:
@ -2617,9 +2618,8 @@ class AccountCreationWizardWindow:
self.go_online_checkbutton.hide() self.go_online_checkbutton.hide()
img = self.xml.get_widget('finish_image') img = self.xml.get_widget('finish_image')
img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG) img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG)
#FIXME: pango me finish_text = '<big><b>%s</b></big>\n\n%s' % (_('An error occured during account creation') , reason)
finish_text = _('An error occured during account creation:\n') + reason self.finish_label.set_markup(finish_text)
self.finish_label.set_text(finish_text)
self.notebook.set_current_page(3) # show finish page self.notebook.set_current_page(3) # show finish page
def on_advanced_button_clicked(self, widget): def on_advanced_button_clicked(self, widget):

View file

@ -13147,7 +13147,7 @@ Status message</property>
<child> <child>
<widget class="GtkLabel" id="advanced_desc_label"> <widget class="GtkLabel" id="advanced_desc_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes" comments="we talk about Description">(None)</property> <property name="label" translatable="yes"></property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@ -14402,7 +14402,7 @@ Please wait...</property>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
</packing> </packing>
</child> </child>
@ -14411,9 +14411,9 @@ Please wait...</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes"></property> <property name="label" translatable="yes"></property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property> <property name="wrap">True</property>
<property name="selectable">False</property> <property name="selectable">False</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
<property name="yalign">0.5</property> <property name="yalign">0.5</property>
@ -14426,8 +14426,8 @@ Please wait...</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">False</property> <property name="fill">True</property>
</packing> </packing>
</child> </child>
</widget> </widget>