[Rt-commit] rt branch, move-message-catalogs, created. rt-3.8.8-792-g3fac7b9

Jesse Vincent jesse at bestpractical.com
Fri Sep 17 23:04:15 EDT 2010


The branch, move-message-catalogs has been created
        at  3fac7b91a4958fe03a42e78f8f5b2260e9650be0 (commit)

- Log -----------------------------------------------------------------
commit 6f59f0f14fb15654e1cba485be7a5f0985e41d04
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Thu Sep 16 16:36:35 2010 -0400

    standardize  $m->out calls in ShowCustomFields

diff --git a/share/html/Elements/ShowCustomFields b/share/html/Elements/ShowCustomFields
index 0613329..8072cd8 100644
--- a/share/html/Elements/ShowCustomFields
+++ b/share/html/Elements/ShowCustomFields
@@ -108,12 +108,12 @@ my $print_value = sub {
     if ( $cf->IncludeContentForValue ) {
        my $vid = $value->id;
        $m->out(   '<div class="object_cf_value_include" id="object_cf_value_'. $vid .'">' );
-       $m->print( loc("See also:") );
+       $m->out( loc("See also:") );
        $m->out(   '<a href="'. $value->IncludeContentForValue .'">' );
-       $m->print( $value->IncludeContentForValue );
+       $m->out( $value->IncludeContentForValue );
        $m->out(   qq{</a></div>\n} );
        $m->out(   qq{<script><!--\njQuery('#object_cf_value_$vid').load('} );
-       $m->print( $value->IncludeContentForValue );
+       $m->out( $value->IncludeContentForValue );
        $m->out(   qq{');\n--></script>\n} );
     }
 };

commit a8587d7e0259bec61236b331738510155c36b35e
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Sep 17 19:05:51 2010 -0400

    first cut at starting to move .po files to a sane/standard location

diff --git a/lib/RT/I18N/ar.po b/share/po/ar.po
similarity index 100%
rename from lib/RT/I18N/ar.po
rename to share/po/ar.po
diff --git a/lib/RT/I18N/bg.po b/share/po/bg.po
similarity index 100%
rename from lib/RT/I18N/bg.po
rename to share/po/bg.po
diff --git a/lib/RT/I18N/cs.po b/share/po/cs.po
similarity index 100%
rename from lib/RT/I18N/cs.po
rename to share/po/cs.po
diff --git a/lib/RT/I18N/da.po b/share/po/da.po
similarity index 100%
rename from lib/RT/I18N/da.po
rename to share/po/da.po
diff --git a/lib/RT/I18N/de.po b/share/po/de.po
similarity index 100%
rename from lib/RT/I18N/de.po
rename to share/po/de.po
diff --git a/lib/RT/I18N/el.po b/share/po/el.po
similarity index 100%
rename from lib/RT/I18N/el.po
rename to share/po/el.po
diff --git a/lib/RT/I18N/en.po b/share/po/en.po
similarity index 100%
rename from lib/RT/I18N/en.po
rename to share/po/en.po
diff --git a/lib/RT/I18N/en_GB.po b/share/po/en_GB.po
similarity index 100%
rename from lib/RT/I18N/en_GB.po
rename to share/po/en_GB.po
diff --git a/lib/RT/I18N/es.po b/share/po/es.po
similarity index 100%
rename from lib/RT/I18N/es.po
rename to share/po/es.po
diff --git a/lib/RT/I18N/et.po b/share/po/et.po
similarity index 100%
rename from lib/RT/I18N/et.po
rename to share/po/et.po
diff --git a/lib/RT/I18N/fi.po b/share/po/fi.po
similarity index 100%
rename from lib/RT/I18N/fi.po
rename to share/po/fi.po
diff --git a/lib/RT/I18N/fr.po b/share/po/fr.po
similarity index 100%
rename from lib/RT/I18N/fr.po
rename to share/po/fr.po
diff --git a/lib/RT/I18N/he.po b/share/po/he.po
similarity index 100%
rename from lib/RT/I18N/he.po
rename to share/po/he.po
diff --git a/lib/RT/I18N/hr.po b/share/po/hr.po
similarity index 100%
rename from lib/RT/I18N/hr.po
rename to share/po/hr.po
diff --git a/lib/RT/I18N/hu.po b/share/po/hu.po
similarity index 100%
rename from lib/RT/I18N/hu.po
rename to share/po/hu.po
diff --git a/lib/RT/I18N/id.po b/share/po/id.po
similarity index 100%
rename from lib/RT/I18N/id.po
rename to share/po/id.po
diff --git a/lib/RT/I18N/it.po b/share/po/it.po
similarity index 100%
rename from lib/RT/I18N/it.po
rename to share/po/it.po
diff --git a/lib/RT/I18N/ja.po b/share/po/ja.po
similarity index 100%
rename from lib/RT/I18N/ja.po
rename to share/po/ja.po
diff --git a/lib/RT/I18N/lt.po b/share/po/lt.po
similarity index 100%
rename from lib/RT/I18N/lt.po
rename to share/po/lt.po
diff --git a/lib/RT/I18N/nb.po b/share/po/nb.po
similarity index 100%
rename from lib/RT/I18N/nb.po
rename to share/po/nb.po
diff --git a/lib/RT/I18N/nl.po b/share/po/nl.po
similarity index 100%
rename from lib/RT/I18N/nl.po
rename to share/po/nl.po
diff --git a/lib/RT/I18N/nn.po b/share/po/nn.po
similarity index 100%
rename from lib/RT/I18N/nn.po
rename to share/po/nn.po
diff --git a/lib/RT/I18N/pl.po b/share/po/pl.po
similarity index 100%
rename from lib/RT/I18N/pl.po
rename to share/po/pl.po
diff --git a/lib/RT/I18N/pt.po b/share/po/pt.po
similarity index 100%
rename from lib/RT/I18N/pt.po
rename to share/po/pt.po
diff --git a/lib/RT/I18N/pt_BR.po b/share/po/pt_BR.po
similarity index 100%
rename from lib/RT/I18N/pt_BR.po
rename to share/po/pt_BR.po
diff --git a/lib/RT/I18N/pt_PT.po b/share/po/pt_PT.po
similarity index 100%
rename from lib/RT/I18N/pt_PT.po
rename to share/po/pt_PT.po
diff --git a/lib/RT/I18N/ru.po b/share/po/ru.po
similarity index 100%
rename from lib/RT/I18N/ru.po
rename to share/po/ru.po
diff --git a/lib/RT/I18N/sv.po b/share/po/sv.po
similarity index 100%
rename from lib/RT/I18N/sv.po
rename to share/po/sv.po
diff --git a/lib/RT/I18N/tr.po b/share/po/tr.po
similarity index 100%
rename from lib/RT/I18N/tr.po
rename to share/po/tr.po
diff --git a/lib/RT/I18N/zh_CN.po b/share/po/zh_CN.po
similarity index 100%
rename from lib/RT/I18N/zh_CN.po
rename to share/po/zh_CN.po
diff --git a/lib/RT/I18N/zh_TW.po b/share/po/zh_TW.po
similarity index 100%
rename from lib/RT/I18N/zh_TW.po
rename to share/po/zh_TW.po

commit 3fac7b91a4958fe03a42e78f8f5b2260e9650be0
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Sep 17 22:37:09 2010 -0400

    teach RT about the moved po file location

diff --git a/Makefile.in b/Makefile.in
index e023e16..890093f 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,6 +107,7 @@ RT_MAN_PATH		=	@RT_MAN_PATH_R@
 RT_VAR_PATH		=	@RT_VAR_PATH_R@
 RT_DOC_PATH		=	@RT_DOC_PATH_R@
 RT_FONT_PATH		=	@RT_FONT_PATH_R@
+RT_LEXICON_PATH		=	@RT_LEXICON_PATH_R@
 RT_LOCAL_PATH		=	@RT_LOCAL_PATH_R@
 LOCAL_PLUGIN_PATH	=	@RT_LOCAL_PATH_R@/plugins
 LOCAL_ETC_PATH		=	@LOCAL_ETC_PATH_R@
@@ -289,7 +290,7 @@ upgrade-instruct:
 
 upgrade: testdeps config-install dirs files-install fixperms upgrade-instruct
 
-upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install font-install fixperms
+upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install po-install font-install fixperms
 
 
 # {{{ dependencies
@@ -333,14 +334,20 @@ fixperms:
 	# Make the system binaries executable also
 	cd $(DESTDIR)$(RT_SBIN_PATH) && ( chmod 0755 $(SYSTEM_BINARIES) ; chown $(BIN_OWNER) $(SYSTEM_BINARIES);  chgrp $(RTGROUP) $(SYSTEM_BINARIES))
 
+
 	# Make the web ui readable by all. 
 	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)$(MASON_HTML_PATH) \
 					$(DESTDIR)$(MASON_LOCAL_HTML_PATH) \
+					$(DESTDIR)$(RT_LEXICON_PATH) \
 					$(DESTDIR)$(LOCAL_LEXICON_PATH)
 	chown -R $(LIBS_OWNER) 	$(DESTDIR)$(MASON_HTML_PATH) \
-				$(DESTDIR)$(MASON_LOCAL_HTML_PATH)
+				$(DESTDIR)$(MASON_LOCAL_HTML_PATH) \
+				$(DESTDIR)$(RT_LEXICON_PATH) \
+				$(DESTDIR)$(LOCAL_LEXICON_PATH)
 	chgrp -R $(LIBS_GROUP) 	$(DESTDIR)$(MASON_HTML_PATH) \
-				$(DESTDIR)$(MASON_LOCAL_HTML_PATH)
+				$(DESTDIR)$(MASON_LOCAL_HTML_PATH) \
+				$(DESTDIR)$(RT_LEXICON_PATH) \
+				$(DESTDIR)$(LOCAL_LEXICON_PATH)
 
 	# Make the web ui's data dir writable
 	chmod 0770  	$(DESTDIR)$(MASON_DATA_PATH) \
@@ -355,6 +362,7 @@ fixperms:
 dirs:
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_LOG_PATH)
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_FONT_PATH)
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_LEXICON_PATH)
 	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_DATA_PATH)
 	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_DATA_PATH)/cache
 	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_DATA_PATH)/etc
@@ -437,6 +445,17 @@ font-install:
 @COMMENT_INPLACE_LAYOUT@	done
 # }}}
 
+
+# {{{ po-install
+po-install:
+ at COMMENT_INPLACE_LAYOUT@	[ -d $(DESTDIR)$(RT_LEXICON_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_LEXICON_PATH)
+ at COMMENT_INPLACE_LAYOUT@	-( cd share/po && find . -type f -print ) | while read file ; do \
+ at COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0644 "share/po/$$file" "$(DESTDIR)$(RT_LEXICON_PATH)/$$file" ; \
+ at COMMENT_INPLACE_LAYOUT@	done
+# }}}
+
+
+
 # {{{ doc-install
 doc-install:
 @COMMENT_INPLACE_LAYOUT@	# RT 3.0.0 - RT 3.0.2 would accidentally create a file instead of a dir
diff --git a/aclocal.m4 b/aclocal.m4
index 044af5a..a2686b9 100755
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -91,7 +91,7 @@ AC_DEFUN([RT_LAYOUT],[
 			changequote({,})
 			for var in prefix exec_prefix bindir sbindir \
 				 sysconfdir mandir libdir datadir htmldir fontdir\
-				 localstatedir logfiledir masonstatedir \
+				 lexdir localstatedir logfiledir masonstatedir \
 				 sessionstatedir customdir custometcdir customhtmldir \
 				 customlexdir customlibdir manualdir; do
 				eval "val=\"\$$var\""
@@ -113,6 +113,7 @@ AC_DEFUN([RT_LAYOUT],[
 	RT_SUBST_EXPANDED_ARG(sysconfdir)
 	RT_SUBST_EXPANDED_ARG(mandir)
 	RT_SUBST_EXPANDED_ARG(libdir)
+	RT_SUBST_EXPANDED_ARG(lexdir)
 	RT_SUBST_EXPANDED_ARG(datadir)
 	RT_SUBST_EXPANDED_ARG(htmldir)
 	RT_SUBST_EXPANDED_ARG(fontdir)
diff --git a/config.layout b/config.layout
index 87078a1..dd6008f 100755
--- a/config.layout
+++ b/config.layout
@@ -28,6 +28,7 @@
   datadir:		${prefix}/share
   htmldir:		${datadir}/html
   fontdir:		${datadir}/fonts
+  lexdir:		${datadir}/po
   manualdir:		${datadir}/doc
   localstatedir:	${prefix}/var
   logfiledir:		${localstatedir}/log
@@ -50,6 +51,7 @@
   libdir:		${prefix}/lib
   datadir:		${prefix}/share
   htmldir:		${datadir}/html
+  lexdir:		${datadir}/po
   fontdir:		${datadir}/fonts
   manualdir:		${datadir}/doc
   localstatedir:	${prefix}/var
@@ -76,6 +78,7 @@
 # FIXME: no such directory in FHS; shouldn't go to somewhere in "${datadir}/rt/"?
   plugindir:		${datadir}/plugins
   htmldir:		${datadir}/html
+  lexdir:		${datadir}/po
   fontdir:		${datadir}/fonts
   manualdir:		${datadir}/doc
   localstatedir:	/var
@@ -101,6 +104,7 @@
   libdir:		${prefix}/lib+
   datadir:		${prefix}/share+
   htmldir:		${datadir}/html
+  lexdir:		${datadir}/po
   fontdir:		${datadir}/fonts
   manualdir:		${prefix}/share/doc+
   logfiledir:		/var/log
@@ -126,6 +130,7 @@
   datadir:		${prefix}
   htmldir:		${datadir}/html
   fontdir:		${datadir}/fonts
+  lexdir:		${datadir}/po
   manualdir:		${datadir}/doc
   localstatedir:	${prefix}/var
   logfiledir:		${localstatedir}/log
@@ -150,6 +155,7 @@
   datadir:		/var/rt
   htmldir:		${datadir}/html
   fontdir:		${datadir}/fonts
+  lexdir:		${datadir}/po
   manualdir:		${datadir}/doc
   plugindir:		${datadir}/plugins
   localstatedir:	/var
@@ -175,6 +181,7 @@
   datadir:		share
   htmldir:		${datadir}/html
   fontdir:		${datadir}/fonts
+  lexdir:		${datadir}/po
   manualdir:	${datadir}/doc
   localstatedir:	var
   logfiledir:		${localstatedir}/log
diff --git a/configure.ac b/configure.ac
index ce41489..952ddb5 100755
--- a/configure.ac
+++ b/configure.ac
@@ -328,6 +328,7 @@ AC_SUBST([RT_PATH],			${exp_prefix})
 AC_SUBST([RT_DOC_PATH],			${exp_manualdir})
 AC_SUBST([RT_LOCAL_PATH],		${exp_customdir})
 AC_SUBST([RT_LIB_PATH],			${exp_libdir})
+AC_SUBST([RT_LEXICON_PATH],			${exp_lexdir})
 AC_SUBST([RT_ETC_PATH],			${exp_sysconfdir})
 AC_SUBST([CONFIG_FILE_PATH],		${exp_sysconfdir})
 AC_SUBST([RT_BIN_PATH],			${exp_bindir})
@@ -357,6 +358,7 @@ AC_SUBST([RT_SBIN_PATH_R],		${exp_prefix}/${exp_sbindir})
 AC_SUBST([RT_VAR_PATH_R],			${exp_prefix}/${exp_localstatedir})
 AC_SUBST([RT_MAN_PATH_R],			${exp_prefix}/${exp_mandir})
 AC_SUBST([RT_FONT_PATH_R],			${exp_prefix}/${exp_fontdir})
+AC_SUBST([RT_LEXICON_PATH_R],			${exp_prefix}/${exp_lexdir})
 AC_SUBST([RT_PLUGIN_PATH_R],		${exp_prefix}/${exp_plugindir})
 AC_SUBST([MASON_DATA_PATH_R],		${exp_prefix}/${exp_masonstatedir})
 AC_SUBST([MASON_SESSION_PATH_R],		${exp_prefix}/${exp_sessionstatedir})
@@ -371,6 +373,7 @@ AC_SUBST([RT_PATH_R],			${exp_prefix})
 AC_SUBST([RT_DOC_PATH_R],			${exp_manualdir})
 AC_SUBST([RT_LOCAL_PATH_R],		${exp_customdir})
 AC_SUBST([RT_LIB_PATH_R],			${exp_libdir})
+AC_SUBST([RT_LEXICON_PATH_R],			${exp_lexdir})
 AC_SUBST([RT_ETC_PATH_R],			${exp_sysconfdir})
 AC_SUBST([RT_PLUGIN_PATH_R],		${exp_plugindir})
 AC_SUBST([CONFIG_FILE_PATH_R],		${exp_sysconfdir})
diff --git a/lib/RT.pm.in b/lib/RT.pm.in
index 99436aa..05ca34a 100755
--- a/lib/RT.pm.in
+++ b/lib/RT.pm.in
@@ -66,6 +66,7 @@ our $EtcPath = '@RT_ETC_PATH@';
 our $BinPath = '@RT_BIN_PATH@';
 our $SbinPath = '@RT_SBIN_PATH@';
 our $VarPath = '@RT_VAR_PATH@';
+our $LexiconPath = '@RT_LEXICON_PATH@';
 our $PluginPath = '@RT_PLUGIN_PATH@';
 our $LocalPath = '@RT_LOCAL_PATH@';
 our $LocalEtcPath = '@LOCAL_ETC_PATH@';
diff --git a/lib/RT/I18N.pm b/lib/RT/I18N.pm
index 6dbda4a..f4fc413 100755
--- a/lib/RT/I18N.pm
+++ b/lib/RT/I18N.pm
@@ -115,9 +115,9 @@ sub Init {
     my %import;
     foreach my $l ( @lang ) {
         $import{$l} = [
-            Gettext => (substr(__FILE__, 0, -3) . "/$l.po"),
-            Gettext => "$RT::LocalLexiconPath/*/$l.po",
-            Gettext => "$RT::LocalLexiconPath/$l.po",
+            Gettext => $RT::LexiconPath."/$l.po",
+            Gettext => $RT::LocalLexiconPath."/*/$l.po",
+            Gettext => $RT::LocalLexiconPath."/$l.po",
         ];
         push @{ $import{$l} }, map {(Gettext => "$_/$l.po")} RT->PluginDirs('po');
     }

-----------------------------------------------------------------------


More information about the Rt-commit mailing list