Tried to use only one spelling for devedeng

This commit is contained in:
Andrea Musuruane 2016-02-28 16:54:12 +01:00
parent 13bb7c67d7
commit 07ab7610c1
3 changed files with 23 additions and 23 deletions

View file

@ -11,20 +11,20 @@ except:
def get_data_files(): def get_data_files():
data_files = [ data_files = [
(os.path.join('share', 'applications'), ['data/devede_ng.desktop']), (os.path.join('share', 'applications'), ['data/devedeng.desktop']),
(os.path.join('share', 'pixmaps'), ['data/devedeng.svg']), (os.path.join('share', 'pixmaps'), ['data/devedeng.svg']),
(os.path.join('share', 'devede_ng'), glob("data/interface/*")), (os.path.join('share', 'devedeng'), glob("data/interface/*")),
(os.path.join('share', 'devede_ng'), glob('data/pixmaps/*g')), (os.path.join('share', 'devedeng'), glob('data/pixmaps/*g')),
(os.path.join('share', 'devede_ng'), ['data/devedeng.svg']), (os.path.join('share', 'devedeng'), ['data/devedeng.svg']),
(os.path.join('share', 'devede_ng'), ['data/codepages.lst']), (os.path.join('share', 'devedeng'), ['data/codepages.lst']),
(os.path.join('share', 'devede_ng'), ['data/languages.lst']), (os.path.join('share', 'devedeng'), ['data/languages.lst']),
(os.path.join('share', 'devede_ng', 'backgrounds'), glob('data/pixmaps/backgrounds/*')), (os.path.join('share', 'devedeng', 'backgrounds'), glob('data/pixmaps/backgrounds/*')),
(os.path.join('share', 'doc', 'devede_ng', 'html'), glob('doc/*')), (os.path.join('share', 'doc', 'devedeng', 'html'), glob('doc/*')),
(os.path.join('share','man','man1'), ['data/devede.1.gz']) (os.path.join('share','man','man1'), ['data/devede.1.gz'])
] ]
for lang_name in [f for f in os.listdir('locale')]: for lang_name in [f for f in os.listdir('locale')]:
mofile = os.path.join('locale', lang_name,'LC_MESSAGES','devede_ng.mo') mofile = os.path.join('locale', lang_name,'LC_MESSAGES','devedeng.mo')
# translations must be always in /usr/share because Gtk.builder only search there. If someone knows how to fix this... # translations must be always in /usr/share because Gtk.builder only search there. If someone knows how to fix this...
target = os.path.join('/usr','share', 'locale', lang_name, 'LC_MESSAGES') # share/locale/fr/LC_MESSAGES/ target = os.path.join('/usr','share', 'locale', lang_name, 'LC_MESSAGES') # share/locale/fr/LC_MESSAGES/
data_files.append((target, [mofile])) data_files.append((target, [mofile]))
@ -40,7 +40,7 @@ def compile_translations():
lang = os.path.basename(pofile)[:-3] # len('.po') == 3 lang = os.path.basename(pofile)[:-3] # len('.po') == 3
modir = os.path.join('locale', lang, 'LC_MESSAGES') # e.g. locale/fr/LC_MESSAGES/ modir = os.path.join('locale', lang, 'LC_MESSAGES') # e.g. locale/fr/LC_MESSAGES/
mofile = os.path.join(modir, 'devede_ng.mo') # e.g. locale/fr/LC_MESSAGES/devede_ng.mo mofile = os.path.join(modir, 'devedeng.mo') # e.g. locale/fr/LC_MESSAGES/devedeng.mo
# create an architecture for these locales # create an architecture for these locales
if not os.path.isdir(modir): if not os.path.isdir(modir):

View file

@ -54,14 +54,14 @@ class configuration(GObject.GObject):
self.disc_type = None self.disc_type = None
try: try:
os.stat("/usr/share/devede_ng/wselect_disk.ui") os.stat("/usr/share/devedeng/wselect_disk.ui")
is_local = False is_local = False
except: except:
pass pass
if is_local is None: if is_local is None:
try: try:
os.stat("/usr/local/share/devede_ng/wselect_disk.ui") os.stat("/usr/local/share/devedeng/wselect_disk.ui")
is_local = True is_local = True
except: except:
pass pass
@ -72,20 +72,20 @@ class configuration(GObject.GObject):
if (is_local): if (is_local):
# locales must be always at /usr/share/locale because Gtk.Builder always search there # locales must be always at /usr/share/locale because Gtk.Builder always search there
self.share_locale="/usr/share/locale" self.share_locale="/usr/share/locale"
self.glade="/usr/local/share/devede_ng" self.glade="/usr/local/share/devedeng"
self.font_path="/usr/local/share/devede_ng" self.font_path="/usr/local/share/devedeng"
self.pic_path="/usr/local/share/devede_ng" self.pic_path="/usr/local/share/devedeng"
self.other_path="/usr/local/share/devede_ng" self.other_path="/usr/local/share/devedeng"
self.help_path="/usr/local/share/doc/devede_ng" self.help_path="/usr/local/share/doc/devedeng"
else: else:
self.share_locale="/usr/share/locale" self.share_locale="/usr/share/locale"
self.glade="/usr/share/devede_ng" self.glade="/usr/share/devedeng"
self.font_path="/usr/share/devede_ng" self.font_path="/usr/share/devedeng"
self.pic_path="/usr/share/devede_ng" self.pic_path="/usr/share/devedeng"
self.other_path="/usr/share/devede_ng" self.other_path="/usr/share/devedeng"
self.help_path="/usr/share/doc/devede_ng" self.help_path="/usr/share/doc/devedeng"
self.gettext_domain = "devede_ng" self.gettext_domain = "devedeng"
self.PAL = True self.PAL = True
self.tmp_folder = "/var/tmp" self.tmp_folder = "/var/tmp"