mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Fix bug which caused %s to not be replaced in welcome wizrd if the user changes their language in the wizard
This commit is contained in:
parent
23875dec1a
commit
33f0cc9b7b
@ -675,9 +675,7 @@ class Wizard(QWizard):
|
|||||||
self.connect(self.library_page, SIGNAL('retranslate()'),
|
self.connect(self.library_page, SIGNAL('retranslate()'),
|
||||||
self.retranslate)
|
self.retranslate)
|
||||||
self.finish_page = FinishPage()
|
self.finish_page = FinishPage()
|
||||||
bt = unicode(self.buttonText(self.FinishButton)).replace('&', '')
|
self.set_finish_text()
|
||||||
t = unicode(self.finish_page.finish_text.text())
|
|
||||||
self.finish_page.finish_text.setText(t%bt)
|
|
||||||
self.kindle_page = KindlePage()
|
self.kindle_page = KindlePage()
|
||||||
self.stanza_page = StanzaPage()
|
self.stanza_page = StanzaPage()
|
||||||
self.word_player_page = WordPlayerPage()
|
self.word_player_page = WordPlayerPage()
|
||||||
@ -702,6 +700,7 @@ class Wizard(QWizard):
|
|||||||
for pid in self.pageIds():
|
for pid in self.pageIds():
|
||||||
page = self.page(pid)
|
page = self.page(pid)
|
||||||
page.retranslateUi(page)
|
page.retranslateUi(page)
|
||||||
|
self.set_finish_text()
|
||||||
|
|
||||||
def accept(self):
|
def accept(self):
|
||||||
pages = map(self.page, self.visitedPages())
|
pages = map(self.page, self.visitedPages())
|
||||||
@ -715,6 +714,13 @@ class Wizard(QWizard):
|
|||||||
def completed(self, newloc):
|
def completed(self, newloc):
|
||||||
return QWizard.accept(self)
|
return QWizard.accept(self)
|
||||||
|
|
||||||
|
def set_finish_text(self, *args):
|
||||||
|
bt = unicode(self.buttonText(self.FinishButton)).replace('&', '')
|
||||||
|
t = unicode(self.finish_page.finish_text.text())
|
||||||
|
if '%s' in t:
|
||||||
|
self.finish_page.finish_text.setText(t%bt)
|
||||||
|
|
||||||
|
|
||||||
def wizard(parent=None):
|
def wizard(parent=None):
|
||||||
w = Wizard(parent)
|
w = Wizard(parent)
|
||||||
return w
|
return w
|
||||||
|
Loading…
x
Reference in New Issue
Block a user