evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'steffen'

Browse Source
This commit is contained in:
Mika Bostrom
2010-08-29 22:17:38 +03:00
parent f27396ea12 d53b0f7f2a
commit e66e3a001f
22 changed files with 1722 additions and 1504 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packaging/gentoo/ChangeLog
+13
View File
@@ -2,6 +2,19 @@
# Distributed under the terms of the GNU General Public License v2
# created by Steffen Schaumburg, steffen@schaumburger.info
29 Aug 2010; Erki Ferenc <erkiferenc@gmail.com>
fpdb-0.20.906.ebuild, fpdb-9999.ebuild:
improve l10n handling
29 Aug 2010; Steffen Schaumburg <steffen@schaumburger.info>
fpdb-0.20.1.ebuild, fpdb-0.20.906.ebuild, fpdb-9999.ebuild:
change required python version to 2.6
*fpdb-0.20.906 (29 Aug 2010)
29 Aug 2010; Steffen Schaumburg <steffen@schaumburger.info>
+fpdb-0.20.906.ebuild -fpdb-0.20.904.ebuild:
Bump version
*fpdb-0.20.1 fpdb-0.20.904 fpdb-9999 (17 Aug 2010)
17 Aug 2010; Steffen Schaumburg <steffen@schaumburger.info>
packaging/gentoo/Manifest
+5 -5
View File
@@ -1,7 +1,7 @@
DIST fpdb-0.20.1.tar.bz2 662807 RMD160 b5f22a684c605ddbba7d2154005a822b02a19490 SHA1 e4cc40de5849d3ae33a680d917b340ab37c6448b SHA256 46eff0625f300c070ce88c519ae6019f6e1c98a7725733c5e16b50a058247fe3
DIST fpdb-0.20.904.tar.bz2 632871 RMD160 6af83a9b30e8b3f394b011a4dc92937f130b9e15 SHA1 083c51f1627f901e24801bf6abebf1d07646bd89 SHA256 5e72055fe7ebb0c6048282f8edc972ee01be21063d6f8071abef22111f3e82f9
EBUILD fpdb-0.20.1.ebuild 1591 RMD160 56ccbca72353e56718a927178e58d148177f5846 SHA1 770df692b29b7314d70703010e1f6afac623c3f3 SHA256 e3f434df58d98760a118458166f9fdfcf3612712c78c704f089f6e8ec72bd224
EBUILD fpdb-0.20.904.ebuild 1595 RMD160 b5cbcdb8d2984b149c833db8b6aee362168e9c7d SHA1 7151fd3cef087c38060b44adb622843a84209f33 SHA256 41c6ed71aa0ff727d670c94cc72cf595bcd038f601121e51222532df727a6d01
EBUILD fpdb-9999.ebuild 1618 RMD160 843d309bbc2ccdd95dbb4b0eb08571d8e16d06ad SHA1 b1ebdbe0e40bd6c0d4ec417dd2b8a135884547a6 SHA256 72205c1f94bcf2c3f310d396928e357fabaee4861773044c1dac71f98f6596bf
MISC ChangeLog 395 RMD160 b195ccf198011356ca79b16071093c4d92e5927a SHA1 9aa56e5dc9c5d03b62fb60bc81069f3440b1f606 SHA256 b7ba8c180da0e6a405d939c4485f9c8e52fdcafb04207ef6de217a807015bd03
DIST fpdb-0.20.906.tar.bz2 702558 RMD160 bc5d01ef4899502aea33f286ac4274ef7ef498ef SHA1 9791680d53de1b276dc0297ac43a0e11758d3e19 SHA256 9ae706d5e9c2a2ee031d2b222ba46e088993cc892fc08b5276bbfd5e44a0436b
EBUILD fpdb-0.20.1.ebuild 1508 RMD160 7585cd1de73172649e182782d427a476afed4036 SHA1 3c92d6dbb868b8b4c26b75539771641087742761 SHA256 9a7d302016e4c4d6cc18af14514bd5112d18aeb7dc6390a3413e3e4cc71da6bd
EBUILD fpdb-0.20.906.ebuild 1643 RMD160 ed44ee49d715458b54edbbe054eb5c9775c6ac7a SHA1 ebd8ea291ace0671d4eb264754dfb0616373a51a SHA256 a9bdad768a0ab5ef065f3e6e2e1bd89dded6e0d3b64c4771944c4aae7d163efd
EBUILD fpdb-9999.ebuild 1685 RMD160 f06457ead33dca99c0acf830f26bbf2f8ca12cd1 SHA1 70444fa4a88439955472407ec0b072970993631a SHA256 2df59120b376bb4e5966f8a719bc881c756b3210b7a30d394ee1753efbfd706e
MISC ChangeLog 831 RMD160 efd32886d09b0750e680716030c0034c3a280a25 SHA1 82f3eda3cd83cbba3e45d4b75593e74f3dd4f568 SHA256 d74efef05cf51ef3840ef043218c8a30c1bcccfa9d9d2e4ca1b7198ed1c91f29
MISC metadata.xml 550 RMD160 a6fa8799f644c0882f832a12cc9e6a0f4f09ae7f SHA1 3a40c442cadb1f532e0299040c2da79e9721dd4f SHA256 b5a1c538de3786446a87479b1023cdb4f084085feb7290959619739969ce7d3b
packaging/gentoo/current_stable.ebuild
+2 -5
View File
@@ -4,10 +4,7 @@
EAPI="2"
inherit eutils
inherit games
NEED_PYTHON=2.5
inherit eutils games
DESCRIPTION="A free/open source tracker/HUD for use with online poker"
HOMEPAGE="http://fpdb.wiki.sourceforge.net/"
@@ -49,7 +46,7 @@ src_install() {
newicon gfx/fpdb-icon.png ${PN}.png
make_desktop_entry ${PN}
chmod +x "${D}/${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
fperms +x "${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
prepgamesdirs
}
packaging/gentoo/current_testing.ebuild
+12 -17
View File
@@ -4,10 +4,7 @@
EAPI="2"
inherit eutils
inherit games
NEED_PYTHON=2.5
inherit eutils games
DESCRIPTION="A free/open source tracker/HUD for use with online poker"
HOMEPAGE="http://fpdb.wiki.sourceforge.net/"
@@ -18,7 +15,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
#note: this should work on other architectures too, please send me your experiences
IUSE="graph mysql postgres sqlite linguas_hu linguas_it"
IUSE="graph mysql postgres sqlite linguas_hu"
RDEPEND="
mysql? ( virtual/mysql
dev-python/mysql-python )
@@ -36,29 +33,27 @@ DEPEND="${RDEPEND}"
src_install() {
insinto "${GAMES_DATADIR}"/${PN}
doins -r gfx
doins -r pyfpdb
doins -r gfx || die "failed to install gfx directory"
doins -r pyfpdb || die "failed to install pyfpdb directory"
if use linguas_hu; then
dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/hu/LC_MESSAGES/${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${PN}.mo
msgfmt pyfpdb/locale/fpdb-hu_HU.po -o pyfpdb/locale/hu.mo || die "failed to create hungarian mo file"
fi
if use linguas_it; then
dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/it/LC_MESSAGES/${PN}.mo /usr/share/locale/it/LC_MESSAGES/${PN}.mo
fi
domo pyfpdb/locale/*.mo || die "failed to install mo files"
doins readme.txt
doins readme.txt || die "failed to install readme.txt file"
exeinto "${GAMES_DATADIR}"/${PN}
doexe run_fpdb.py
doexe run_fpdb.py || die "failed to install executable run_fpdb.py"
dodir "${GAMES_BINDIR}"
dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN}
dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN} || die "failed to create symlink for starting fpdb"
newicon gfx/fpdb-icon.png ${PN}.png
make_desktop_entry ${PN}
newicon gfx/fpdb-icon.png ${PN}.png || die "failed to install fpdb icon"
make_desktop_entry ${PN} || die "failed to create desktop entry"
chmod +x "${D}/${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
fperms +x "${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
prepgamesdirs
}
packaging/gentoo/dev-readme.txt
-5
View File
@@ -1,10 +1,5 @@
Repoman currently gives the following errors for our ebuilds:
ebuild.allmasked: This error can be ignored, as all our packages are supposed to be masked
ebuild.badheader 3
games-util/fpdb/fpdb-0.20.1.ebuild: Malformed CVS Header on line: 3
games-util/fpdb/fpdb-0.20.904.ebuild: Malformed CVS Header on line: 3
games-util/fpdb/fpdb-9999.ebuild: Malformed CVS Header on line: 3
not sure what the correct header is for a sunrise ebuild so leaving as-is for now
Useful Links:
http://overlays.gentoo.org/proj/sunrise/wiki/SunriseFaq
packaging/gentoo/fpdb-9999.ebuild
+9 -12
View File
@@ -4,11 +4,7 @@
EAPI="2"
inherit eutils
inherit games
inherit git
NEED_PYTHON=2.5
inherit eutils games git
DESCRIPTION="A free/open source tracker/HUD for use with online poker"
HOMEPAGE="http://fpdb.wiki.sourceforge.net/"
@@ -17,9 +13,8 @@ EGIT_REPO_URI="git://git.assembla.com/fpdb.git"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS=""
#note: this should work on other architectures too, please send me your experiences
IUSE="graph mysql postgres sqlite linguas_hu linguas_it"
IUSE="graph mysql postgres sqlite linguas_de linguas_hu"
RDEPEND="
mysql? ( virtual/mysql
dev-python/mysql-python )
@@ -44,14 +39,16 @@ src_install() {
doins -r gfx
doins -r pyfpdb
if use linguas_hu; then
dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/hu/LC_MESSAGES/${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${PN}.mo
if use linguas_de; then
msgfmt pyfpdb/locale/fpdb-de_DE.po -o pyfpdb/locale/de.mo
fi
if use linguas_it; then
dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/it/LC_MESSAGES/${PN}.mo /usr/share/locale/it/LC_MESSAGES/${PN}.mo
if use linguas_hu; then
msgfmt pyfpdb/locale/fpdb-hu_HU.po -o pyfpdb/locale/hu.mo
fi
domo pyfpdb/locale/*.mo
doins readme.txt
exeinto "${GAMES_DATADIR}"/${PN}
@@ -63,7 +60,7 @@ src_install() {
newicon gfx/fpdb-icon.png ${PN}.png
make_desktop_entry ${PN}
chmod +x "${D}/${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
fperms +x "${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
prepgamesdirs
}
pyfpdb/Configuration.py
+2 -2
View File
@@ -132,8 +132,8 @@ def get_config(file_name, fallback = True):
print msg
logging.info(msg)
except:
print _("Error copying .example file, cannot fall back. Exiting.\n")
sys.stderr.write(_("Error copying .example file, cannot fall back. Exiting.\n"))
print _("Error copying .example config file, cannot fall back. Exiting.\n")
sys.stderr.write(_("Error copying .example config file, cannot fall back. Exiting.\n"))
sys.stderr.write( str(sys.exc_info()) )
sys.exit()
elif fallback:
pyfpdb/Filters.py
+3 -3
View File
@@ -63,7 +63,7 @@ class Filters(threading.Thread):
,'seatsbetween':_('Between:'), 'seatsand':_('And:'), 'seatsshow':_('Show Number of _Players')
,'playerstitle':_('Hero:'), 'sitestitle':_('Sites:'), 'gamestitle':_('Games:')
,'limitstitle':_('Limits:'), 'seatstitle':_('Number of Players:')
,'groupstitle':_('Grouping:'), 'posnshow':_('Show Position Stats:')
,'groupstitle':_('Grouping:'), 'posnshow':_('Show Position Stats')
,'datestitle':_('Date:')
,'groupsall':_('All Players')
,'limitsFL':'FL', 'limitsNL':'NL', 'limitsPL':'PL', 'ring':_('Ring'), 'tour':_('Tourney')
@@ -891,7 +891,7 @@ class Filters(threading.Thread):
hbox = gtk.HBox()
vbox1.pack_start(hbox, False, True, 0)
lbl_start = gtk.Label('From:')
lbl_start = gtk.Label(_('From:'))
btn_start = gtk.Button()
btn_start.set_image(gtk.image_new_from_stock(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON))
@@ -905,7 +905,7 @@ class Filters(threading.Thread):
hbox = gtk.HBox()
vbox1.pack_start(hbox, False, True, 0)
lbl_end = gtk.Label(' To:')
lbl_end = gtk.Label(_('To:'))
btn_end = gtk.Button()
btn_end.set_image(gtk.image_new_from_stock(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON))
btn_end.connect('clicked', self.__calendar_dialog, self.end_date)
pyfpdb/GuiAutoImport.py
+10 -10
View File
@@ -113,7 +113,7 @@ class GuiAutoImport (threading.Thread):
hbox.pack_start(lbl1, expand=True, fill=False)
self.doAutoImportBool = False
self.startButton = gtk.ToggleButton(_(" Start _Autoimport "))
self.startButton = gtk.ToggleButton(_(" Start _Auto Import "))
self.startButton.connect("clicked", self.startClicked, "start clicked")
hbox.pack_start(self.startButton, expand=False, fill=False)
@@ -132,7 +132,7 @@ class GuiAutoImport (threading.Thread):
scrolledwindow.add(self.textview)
self.mainVBox.show_all()
self.addText(_("AutoImport Ready."))
self.addText(_("Auto Import Ready."))
def addText(self, text):
end_iter = self.textbuffer.get_end_iter()
@@ -145,7 +145,7 @@ class GuiAutoImport (threading.Thread):
"""runs when user clicks one of the browse buttons in the auto import tab"""
current_path=data[1].get_text()
dia_chooser = gtk.FileChooserDialog(title=_("Please choose the path that you want to auto import"),
dia_chooser = gtk.FileChooserDialog(title=_("Please choose the path that you want to Auto Import"),
action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_OPEN,gtk.RESPONSE_OK))
#dia_chooser.set_current_folder(pathname)
@@ -179,9 +179,9 @@ class GuiAutoImport (threading.Thread):
def reset_startbutton(self):
if self.pipe_to_hud is not None:
self.startButton.set_label(_(u' Stop _Autoimport '))
self.startButton.set_label(_(u' Stop _Auto Import '))
else:
self.startButton.set_label(_(u' Start _Autoimport '))
self.startButton.set_label(_(u' Start _Auto Import '))
return False
@@ -206,7 +206,7 @@ class GuiAutoImport (threading.Thread):
if self.settings['global_lock'].acquire(False): # returns false immediately if lock not acquired
self.addText(_("\nGlobal lock taken ... Auto Import Started.\n"))
self.doAutoImportBool = True
widget.set_label(_(u' _Stop Autoimport '))
widget.set_label(_(u' _Stop Auto Import '))
if self.pipe_to_hud is None:
if Configuration.FROZEN:
path = Configuration.EXEC_PATH
@@ -246,19 +246,19 @@ class GuiAutoImport (threading.Thread):
self.importtimer = gobject.timeout_add(interval * 1000, self.do_import)
else:
self.addText(_("\nauto-import aborted - global lock not available"))
self.addText(_("\nAuto Import aborted - global lock not available"))
else: # toggled off
gobject.source_remove(self.importtimer)
self.settings['global_lock'].release()
self.doAutoImportBool = False # do_import will return this and stop the gobject callback timer
self.addText(_("\nStopping autoimport - global lock released."))
self.addText(_("\nStopping Auto Import - global lock released."))
if self.pipe_to_hud.poll() is not None:
self.addText(_("\n * Stop Autoimport: HUD already terminated"))
self.addText(_("\n * Stop Auto Import: HUD already terminated"))
else:
#print >>self.pipe_to_hud.stdin, "\n"
self.pipe_to_hud.communicate('\n') # waits for process to terminate
self.pipe_to_hud = None
self.startButton.set_label(_(u' Start _Autoimport '))
self.startButton.set_label(_(u' Start _Auto Import '))
#end def GuiAutoImport.startClicked
pyfpdb/GuiBulkImport.py
+1 -1
View File
@@ -136,7 +136,7 @@ class GuiBulkImport():
#self.settings['global_lock'].release()
self.settings['global_lock'].release()
else:
print _("bulk-import aborted - global lock not available")
print _("bulk import aborted - global lock not available")
def get_vbox(self):
"""returns the vbox of this thread"""
pyfpdb/GuiDatabase.py
+7 -5
View File
@@ -300,7 +300,7 @@ class GuiDatabase:
self.dia.show()
except:
err = traceback.extract_tb(sys.exc_info()[2])[-1]
print _('loaddbs error: ')+str(dbms_num)+','+host+','+name+','+user+','+passwd+' failed: ' \
print _('loadDbs error: ')+str(dbms_num)+','+host+','+name+','+user+','+passwd+' failed: ' \
+ err[2] + "(" + str(err[1]) + "): " + str(sys.exc_info()[1])
def sortCols(self, col, n):
@@ -368,7 +368,7 @@ class GuiDatabase:
try:
# is creating empty db for sqlite ... mod db.py further?
# add noDbTables flag to db.py?
log.debug(_("loaddbs: trying to connect to: %s/%s, %s, %s/%s") % (str(dbms_num),dbms,name,user,passwd))
log.debug(_("testDB: trying to connect to: %s/%s, %s, %s/%s") % (str(dbms_num),dbms,name,user,passwd))
db.connect(backend=dbms_num, host=host, database=name, user=user, password=passwd, create=False)
if db.connected:
log.debug(_(" connected ok"))
@@ -384,14 +384,16 @@ class GuiDatabase:
status = "failed"
icon = gtk.STOCK_CANCEL
except Exceptions.FpdbMySQLNoDatabase:
err_msg = _("MySQL client reports: 2002 or 2003 error. Unable to connect - Please check that the MySQL service has been started")
err_msg = _("MySQL client reports: 2002 or 2003 error. Unable to connect - ") \
+ _("Please check that the MySQL service has been started")
status = "failed"
icon = gtk.STOCK_CANCEL
except Exceptions.FpdbPostgresqlAccessDenied:
err_msg = _("Postgres Server reports: Access denied. Are your permissions set correctly?")
err_msg = _("PostgreSQL Server reports: Access denied. Are your permissions set correctly?")
status = "failed"
except Exceptions.FpdbPostgresqlNoDatabase:
err_msg = _("Postgres client reports: Unable to connect - Please check that the Postgres service has been started")
err_msg = _("PostgreSQL client reports: Unable to connect - ") \
+ _("Please check that the PostgreSQL service has been started")
status = "failed"
icon = gtk.STOCK_CANCEL
except:
pyfpdb/fpdb.pyw
+12 -30
View File
@@ -544,8 +544,9 @@ class fpdb:
#lock_released = False
dia_confirm = gtk.MessageDialog(parent=self.window, flags=gtk.DIALOG_DESTROY_WITH_PARENT, type=gtk.MESSAGE_WARNING,
buttons=(gtk.BUTTONS_YES_NO), message_format=_("Confirm deleting and recreating tables"))
diastring = _("Please confirm that you want to (re-)create the tables. If there already are tables in the database ") \
+self.db.database+" on "+self.db.host+_(" they will be deleted and you will have to re-import your histories.\nThis may take a while.")
diastring = _("Please confirm that you want to (re-)create the tables.") \
+ (_(" If there already are tables in the database %s on %s they will be deleted and you will have to re-import your histories.\n") % (self.db.database, self.db.host)) \
+ _("This may take a while.")
dia_confirm.format_secondary_text(diastring)#todo: make above string with bold for db, host and deleted
# disable windowclose, do not want the the underlying processing interrupted mid-process
dia_confirm.set_deletable(False)
@@ -755,24 +756,6 @@ class fpdb:
def dia_save_profile(self, widget, data=None):
self.warning_box(_("Unimplemented: Save Profile (try saving a HUD layout, that should do it)"))
def diaSetupWizard(self, path):
diaSetupWizard = gtk.Dialog(title=_("Fatal Error - Config File Missing"), parent=None, flags=0, buttons=(gtk.STOCK_QUIT,gtk.RESPONSE_OK))
label = gtk.Label(_("Please copy the config file from the docs folder to:"))
diaSetupWizard.vbox.add(label)
label.show()
label = gtk.Label(path)
diaSetupWizard.vbox.add(label)
label.show()
label = gtk.Label(_("and edit it according to the install documentation at http://fpdb.sourceforge.net"))
diaSetupWizard.vbox.add(label)
label.show()
response = diaSetupWizard.run()
sys.exit(1)
def get_menu(self, window):
"""returns the menu for this program"""
fpdbmenu = """
@@ -876,8 +859,7 @@ class fpdb:
if self.config.example_copy:
self.info_box(_("Config file")
, _("has been created at:\n%s.\n") % self.config.file
+ _("Edit your screen_name and hand history path in the supported_sites ")
+ _("section of the Preferences window (Main menu) before trying to import hands."))
+ _("Edit your screen_name and hand history path in the supported_sites section of the Preferences window (Main menu) before trying to import hands."))
self.settings = {}
self.settings['global_lock'] = self.lock
if (os.sep=="/"):
@@ -906,10 +888,10 @@ class fpdb:
err_msg = _("MySQL client reports: 2002 or 2003 error. Unable to connect - ") \
+ _("Please check that the MySQL service has been started")
except Exceptions.FpdbPostgresqlAccessDenied:
err_msg = _("Postgres Server reports: Access denied. Are your permissions set correctly?")
err_msg = _("PostgreSQL Server reports: Access denied. Are your permissions set correctly?")
except Exceptions.FpdbPostgresqlNoDatabase:
err_msg = _("Postgres client reports: Unable to connect - ") \
+ _("Please check that the Postgres service has been started")
err_msg = _("PostgreSQL client reports: Unable to connect - ") \
+ _("Please check that the PostgreSQL service has been started")
if err_msg is not None:
self.db = None
self.warning_box(err_msg)
@@ -966,10 +948,10 @@ class fpdb:
def obtain_global_lock(self, source):
ret = self.lock.acquire(source=source) # will return false if lock is already held
if ret:
print _("\nGlobal lock taken by"), source
print (_("\nGlobal lock taken by %s") % source)
self.lockTakenBy=source
else:
print _("\nFailed to get global lock, it is currently held by"), source
print (_("\nFailed to get global lock, it is currently held by %s") % source)
return ret
# need to release it later:
# self.lock.release()
@@ -1134,8 +1116,8 @@ You can find the full license texts in agpl-3.0.txt, gpl-2.0.txt, gpl-3.0.txt an
if not options.errorsToConsole:
fileName = os.path.join(self.config.dir_log, 'fpdb-errors.txt')
print _("\nNote: error output is being diverted to fpdb-errors.txt and HUD-errors.txt in:\n") \
+ self.config.dir_log + _("\nAny major error will be reported there _only_.\n")
print (_("\nNote: error output is being diverted to fpdb-errors.txt and HUD-errors.txt in: %s") % self.config.dir_log) \
+ _("\nAny major error will be reported there _only_.\n")
errorFile = open(fileName, 'w', 0)
sys.stderr = errorFile
@@ -1239,7 +1221,7 @@ You can find the full license texts in agpl-3.0.txt, gpl-2.0.txt, gpl-3.0.txt an
hhdir = hhbase
if not os.path.isdir(hhdir):
diapath = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=(gtk.BUTTONS_YES_NO), message_format="Setup hh dir")
diastring = _("WARNING: Unable to find output hh directory %s\n\n Press YES to create this directory, or NO to select a new one.") % hhdir
diastring = _("WARNING: Unable to find output hand history directory %s\n\n Press YES to create this directory, or NO to select a new one.") % hhdir
diapath.format_secondary_text(diastring)
response = diapath.run()
diapath.destroy()
pyfpdb/fpdb_import.py
+4 -4
View File
@@ -224,7 +224,7 @@ class Importer:
#print " adding file ", file
self.addImportFile(os.path.join(dir, file), site, filter)
else:
log.warning(_("Attempted to add non-directory: '%s' as an import directory") % str(dir))
log.warning(_("Attempted to add non-directory '%s' as an import directory") % str(dir))
def runImport(self):
""""Run full import on self.filelist. This is called from GuiBulkImport.py"""
@@ -310,7 +310,7 @@ class Importer:
toterrors += errors
for i in xrange( self.settings['threads'] ):
print _("sending finish msg qlen ="), q.qsize()
print _("sending finish message queue length ="), q.qsize()
db.send_finish_msg(q)
return (totstored, totdups, totpartial, toterrors)
@@ -436,9 +436,9 @@ class Importer:
# Load filter, process file, pass returned filename to import_fpdb_file
if self.settings['threads'] > 0 and self.writeq is not None:
log.info(_("Converting ") + file + " (" + str(q.qsize()) + ")")
log.info((_("Converting %s") % file) + " (" + str(q.qsize()) + ")")
else:
log.info(_("Converting ") + file)
log.info(_("Converting %s") % file)
hhbase = self.config.get_import_parameters().get("hhArchiveBase")
hhbase = os.path.expanduser(hhbase)
hhdir = os.path.join(hhbase,site)
pyfpdb/locale/create-mo-files.sh
-4
View File
@@ -1,4 +0,0 @@
cd ..
python /usr/share/doc/python-2.7/examples/Tools/i18n/msgfmt.py --output-file=locale/hu/LC_MESSAGES/fpdb.mo locale/fpdb-hu_HU.po
python /usr/share/doc/python-2.7/examples/Tools/i18n/msgfmt.py --output-file=locale/de/LC_MESSAGES/fpdb.mo locale/fpdb-de_DE.po
pyfpdb/locale/create-po-file.sh
-4
View File
@@ -1,4 +0,0 @@
cd ..
rm *.pyc
python /usr/share/doc/python-2.7/examples/Tools/i18n/pygettext.py --output-dir=locale --default-domain=fpdb --output=fpdb-en_GB.po *.py*
pyfpdb/locale/de/LC_MESSAGES/fpdb.mo
BIN
View File
Binary file not shown.
pyfpdb/locale/fpdb-de_DE.po
+624 -534
View File
File diff suppressed because it is too large Load Diff
pyfpdb/locale/fpdb-en_GB.po → pyfpdb/locale/fpdb-en_GB.pot
+436 -415
View File
File diff suppressed because it is too large Load Diff
pyfpdb/locale/fpdb-hu_HU.po
+567 -436
View File
File diff suppressed because it is too large Load Diff
pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo
BIN
View File
Binary file not shown.
pyfpdb/locale/localise.sh
Executable
+15
View File
@@ -0,0 +1,15 @@
cd ..
rm *.pyc
echo "creating template po file"
python /usr/share/doc/python-2.7/examples/Tools/i18n/pygettext.py --output-dir=locale --default-domain=fpdb --output=fpdb-en_GB.pot *.py*
echo "merging template with existing translations"
msgmerge --update locale/fpdb-hu_HU.po locale/fpdb-en_GB.pot
msgmerge --update locale/fpdb-de_DE.po locale/fpdb-en_GB.pot
echo "compiling mo files"
python /usr/share/doc/python-2.7/examples/Tools/i18n/msgfmt.py --output-file=locale/hu/LC_MESSAGES/fpdb.mo locale/fpdb-hu_HU.po
python /usr/share/doc/python-2.7/examples/Tools/i18n/msgfmt.py --output-file=locale/de/LC_MESSAGES/fpdb.mo locale/fpdb-de_DE.po
pocount locale/*.po
pyfpdb/locale/update-po-files.sh
-12
View File
@@ -1,12 +0,0 @@
#!/bin/sh
# Our master file
REFERENCE_PO=fpdb-en_GB.po
# Update all .po files
for po in *.po; do
if [ ${po} != ${REFERENCE_PO} ]; then
msgmerge --update ${po} ${REFERENCE_PO}
fi
done