diff libinterp/interpfcn/defaults.cc @ 15971:e27d9b9b71f4

gui: install translation files into $(datadir)/octave/$(version)/locale * build-aux/common.mk: define octlocaledir * configure.ac: default for octlocaledir is '$(datadir)/octave/$(version)/locale * libgui/Makefile.am: octlocale_DATA is the list of translation files * libinterp/interpfcn/defaults.cc: define Voct_locale_dir * libinterp/interpfcn/defaults.cc(set_default_oct_locale_dir): new function; * libinterp/interpfcn/defaults.cc(install_defaults): call set_default_oct_locale_dir () * libinterp/interpfcn/defaults.in.h: define OCTAVE_OCTLOCALEDIR, declare Voct_locale_dir * run-octave.in: set OCTAVE_LOCALE_DIR to $top_srcdir/libgui/languages * libgui/languages/generic.*: renamed into en_US.* * libgui/languages/translators: updated comment related to generic file
author Torsten <ttl@justmail.de>
date Sat, 19 Jan 2013 16:21:46 +0100
parents b1ff8c83e232
children 9bc1f8278966
line wrap: on
line diff
--- a/libinterp/interpfcn/defaults.cc
+++ b/libinterp/interpfcn/defaults.cc
@@ -75,6 +75,7 @@
 std::string Vlocal_fcn_file_dir;
 
 std::string Voct_etc_dir;
+std::string Voct_locale_dir;
 
 std::string Voct_file_dir;
 std::string Vfcn_file_dir;
@@ -224,6 +225,12 @@
 }
 
 static void
+set_default_oct_locale_dir (void)
+{
+  Voct_locale_dir = subst_octave_home (OCTAVE_OCTLOCALEDIR);
+}
+
+static void
 set_default_oct_file_dir (void)
 {
   Voct_file_dir = subst_octave_home (OCTAVE_OCTFILEDIR);
@@ -428,6 +435,7 @@
   set_default_local_fcn_file_dir ();
 
   set_default_oct_etc_dir ();
+  set_default_oct_locale_dir ();
 
   set_default_fcn_file_dir ();
   set_default_oct_file_dir ();