linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 391
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: linuxdcpp-i18n
timestamp: Mon 2010-10-11 18:45:49 -0500
message:
  Refactor GenerateMessageCatalogs
modified:
  SConstruct
  dcpp/SConscript
  linux/SConscript


--
lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n

Your team LinuxDC++ Team is subscribed to branch lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n/+edit-subscription

=== modified file 'SConstruct'
--- SConstruct	2010-10-11 06:05:22 +0000
+++ SConstruct	2010-10-11 23:45:49 +0000
@@ -77,8 +77,9 @@
 			src = os.path.join(root, file)
 			env.Alias('install', env.Install(dir = target, source = src))
 
-def generate_message_catalogs(self, env, po_files):
+def generate_message_catalogs(env):
 	mo_path = os.path.join(BUILD_LOCALE_PATH, '%s', 'LC_MESSAGES', env['package'] + '.mo')
+	po_files = env.Glob('po/*.po', strings = True)
 
 	for po_file in po_files:
 		basename = os.path.basename(po_file)
@@ -332,10 +333,9 @@
 	# Create the executable
 	env.Program(target = PACKAGE, source = [libdcpp, obj_files])
 
+	# i18n
 	env.MergePotFiles(source = [glade_pot_file, linux_pot_file], target = 'po/%s.pot' % PACKAGE)
-
-	po_files = env.Glob('po/*.po', strings = True)
-	env.GenerateMessageCatalogs(env, po_files)
+	env.GenerateMessageCatalogs()
 
 
 # ----------------------------------------------------------------------

=== modified file 'dcpp/SConscript'
--- dcpp/SConscript	2010-10-11 06:05:22 +0000
+++ dcpp/SConscript	2010-10-11 23:45:49 +0000
@@ -3,14 +3,13 @@
 Import('env')
 
 dcpp_files = env.Glob('*.cpp')
-po_files = env.Glob('po/*.po', strings = True)
 
 env.Append(CPPDEFINES = 'BUILDING_DCPP')
 
 # Build the dcpp files and create the library
 libdcpp  = env.StaticLibrary(target = 'dcpp', source = dcpp_files)
 
-env.GenerateMessageCatalogs(env, po_files)
+env.GenerateMessageCatalogs()
 
 Return('libdcpp')
 

=== modified file 'linux/SConscript'
--- linux/SConscript	2010-10-11 06:05:22 +0000
+++ linux/SConscript	2010-10-11 23:45:49 +0000
@@ -7,7 +7,7 @@
 obj_files = []
 
 env.ParseConfig('pkg-config --cflags libglade-2.0')
-env.Append(CPPDEFINES='-DPACKAGE=\'\"%s\"\'' % env['package'])
+env.Append(CPPDEFINES='PACKAGE=\'\"%s\"\'' % env['package'])
 
 # Build the gui_files
 for i, source in enumerate(gui_files):