Browse files

more tidying up

git-svn-id: https://svn.r-project.org/R/trunk@59816 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 8fd799b commit 84a017be383cb11027db876e96a7c2c0cee7a46e ripley committed Jul 14, 2012
Showing with 27 additions and 53 deletions.
  1. +2 −2 Makefile.in
  2. +10 −42 po/Makefile.in
  3. +12 −8 po/README
  4. +3 −1 po/en.po
View
4 Makefile.in
@@ -17,8 +17,8 @@ DISTFILES = $(INSTFILES) \
ChangeLog INSTALL ONEWS OONEWS README VERSION VERSION-NICK \
Makeconf.in Makefile.in Makefile.fw \
config.site configure configure.ac
-SUBDIRS = m4 tools doc etc share src tests @USE_NLS_TRUE@ po
-SUBDIRS_WITH_NO_BUILD = @USE_NLS_FALSE@ po
+SUBDIRS = m4 tools doc etc share src tests
+SUBDIRS_WITH_NO_BUILD = po
all: Makefile Makeconf R docs recommended svn-vignettes
recommended: @USE_RECOMMENDED_PACKAGES_TRUE@ stamp-recommended
View
52 po/Makefile.in
@@ -16,16 +16,12 @@ R_EXE = $(top_builddir)/bin/R --vanilla --slave
Rsharedir = "$(DESTDIR)${rsharedir}"
Rlocaledir = "$(Rsharedir)/locale"
-## FIXME: compute these from a directory listing
-LANGS = da en en_GB es fr de it ja ko nn pl pt_BR ru tr zh_CN zh_TW en@quot
+LANGS = `cd $(srcdir); ls *.po | sed -e 's/\.po//' -e /^RGui/d`
+## LANGS = da en en_GB es fr de it ja ko nn pl pt_BR ru tr zh_CN zh_TW en@quot
## datasets does not have any po, tcltk has src but no tcltk.pot
R_PKGS_PO = base compiler grDevices graphics grid methods parallel splines stats stats4 tcltk tools utils
-
-DISTFILES = README RGui.pot THANKS Makefile.in Makefile.win POTFILES R.pot \
- `ls $(srcdir)/*.po $(srcdir)/*.gmo`
-
.SUFFIXES:
all: all-@USE_NLS@
@@ -42,9 +38,9 @@ install-data: install-data-@USE_NLS@
install-data-no:
install-data-yes:
@$(MKINSTALLDIRS) $(Rsharedir)
- echo "installing translations:"
+ $(ECHO) "installing translations:"
@for lang in $(LANGS); do \
- echo " $$lang"; \
+ $(ECHO) " $$lang"; \
dir=$(Rlocaledir)/$$lang/LC_MESSAGES; \
$(MKINSTALLDIRS) $$dir; \
$(INSTALL_DATA) $(srcdir)/$${lang}.gmo $$dir/R.mo; \
@@ -63,9 +59,6 @@ installdirs-data-yes:
$(MKINSTALLDIRS) $$dir; \
done
-# Define this as empty until I found a useful application.
-installcheck:
-
uninstall: uninstall-exec uninstall-data
uninstall-exec:
uninstall-data: uninstall-data-@USE_NLS@
@@ -79,52 +72,27 @@ check: all
info dvi ps pdf html tags TAGS ctags CTAGS ID:
-mostlyclean:
- @rm -f stamp-poT
- @rm -f core core.* R.po R.1po R.2po *.new.po
- @rm -fr *.o
+clean mostlyclean:
-clean: mostlyclean
-
-distclean: clean
+distclean:
@rm -f Makefile
maintainer-clean: distclean
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir:
- @for file in $(DISTFILES); do \
- if test -f $$file; then \
- cp -p $$file $(distdir) || exit 1; \
- else \
- cp -p $(srcdir)/$$file $(distdir) || exit 1; \
- fi; \
- done
-
Makefile: Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
update-po:
- @echo "tools:::update_po(\"$(top_srcdir)\")" | \
+ @$(ECHO) "tools:::update_po(\"$(top_srcdir)\")" | \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
update-RGui:
- @echo "tools:::update_RGui_po(\"$(top_srcdir)\")" | \
+ @$(ECHO) "tools:::update_RGui_po(\"$(top_srcdir)\")" | \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
update-pkg-po:
@for pkg in $(R_PKGS_PO); do \
- echo "updating translations for $${pkg}"; \
- echo "tools:::update_pkg_po(\"$(top_srcdir)/src/library/$${pkg}\")" | \
+ $(ECHO) "updating translations for $${pkg}"; \
+ $(ECHO) "tools:::update_pkg_po(\"$(top_srcdir)/src/library/$${pkg}\")" | \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null; \
done
-
-
-force:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
View
20 po/README
@@ -1,4 +1,4 @@
-NB: this is in the process of conversion of R scripts. These
+NB: this is in the process of conversion to R scripts. These
instructions may not be current.
If you convert a C file for use with gettext, add it to POTFILES and
@@ -14,14 +14,16 @@ Target
updates the message catalogs for the C and R code in the standard packages.
-If you add a package, add it to R_PKGS_PO in po/Makefile.in. R-level
-catalogs are produced automatically by 'make update-pkg-po' but for a
-C-level catalog you need to touch path/to/package/po/package.pot.
+If you add a package with translations (hence not datasets), add it to
+R_PKGS_PO in po/Makefile.in. R-level template catalogs (R-pkg.pot)
+are produced automatically by 'make update-pkg-po' but for a C-level
+template catalog you need to touch src/library/pkg/po/pkg.pot: only do
+so once some messages have been marked for translation (which is not
+currently the case for tcltk).
To add a new translation, add the lang.po file to this directory and
-add the language to LANGS in Makefile.in, and translators to THANKS.
-For package translations, simply add the [R-]lang.po files to the
-package's po directory.
+translators to THANKS. For package translations, add the [R-]lang.po
+files to the package's po directory (and perhaps update THANKS).
If there are no problems with the translations 'make all R' (in the
builddir, if separate) will do the rest (create ll.gmo and install it
@@ -36,11 +38,13 @@ to check and compile the translation, and
to install it manually for testing.
+Note too tools::checkPoFiles() (which is run by the make cmds).
+
R-core members: after updating translations, run
make update-po update-pkg-po update-RGui
-and then commit the changes from the svn checkout.
+and then commit the changes in the svn checkout.
Windows RGui translations
View
4 po/en.po
@@ -1,7 +1,9 @@
# First pass at localization file for R
-# Copyright (C) 2005 The RCore Team
+# Copyright (C) 2005 The R Core Team
# This file is distributed under the same license as the R package.
#
+# It only exists to provide a start-up banner
+#
msgid ""
msgstr ""
"Project-Id-Version: R 2.1.0\n"

0 comments on commit 84a017b

Please sign in to comment.