guix
/
guix
mirror of git://git.savannah.gnu.org/guix.git
3
4
Fork 0
Code Issues Releases Wiki Activity
77,886 Commits 81 Branches 36 Tags 470 MiB
Commit Graph

12 Commits

Author SHA1 Message Date
Julien Lepiller a23789bbbd
nls: Do not update po files on first make invocation. 
We need to update the minimal gettext version to take advantage of new
features.  Before this patch, the first make invocation would modify
po/guix and po/packages po files, and we advised to run `git checkout
po` to clean the changes.

* configure.ac (AM_GNU_GETTEXT_VERSION): Update to 0.19.1.
* po/guix/Makevars: Set PO_DEPENDS_ON_POT to no.
* po/packages/Makevars: Set PO_DEPENDS_ON_POT to no.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
 2021-05-03 09:29:44 -04:00
Ludovic Courtès 0dc89c0368
nls: Internationalize command synopses as shown in 'guix help'. 
This is a followup to 3794ce93be.

* po/guix/Makevars (XGETTEXT_OPTIONS): Add '--keyword=synopsis'.
 2020-11-03 11:58:00 +01:00
Julien Lepiller ac324be105
nls: Fix copyright and bug address in pot files. 
* po/guix/Makevars: Fix COPYRIGHT_HOLDER and MSGID_BUGS_ADDRESS.
* po/packages/Makevars: idem.
 2020-09-29 15:40:25 +02:00
Ludovic Courtès c65d05b5ac
maint: Do not update PO files upon "make dist". 
This works around a non-determinstic build failure when doing
"make distcheck -j4".

* po/guix/Makevars (DIST_DEPENDS_ON_UPDATE_PO): New variable.
* po/packages/Makevars (DIST_DEPENDS_ON_UPDATE_PO): New variable.
 2017-05-14 15:49:49 +02:00
Ludovic Courtès 69daee23af
ui: Rename '_' to 'G_'. 
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance.  See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.

* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'.  Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
 2017-05-03 16:16:17 +02:00
Ludovic Courtès 7887bcbf56 daemon: Internationalize guix-daemon. 
* nix/nix-daemon/guix-daemon.cc (n_, _): New macros.
  (guix_textdomain): New variable.
  (doc): Use 'n_'.
  (options): Likewise, and lowercase messages.
  (argp): Add initializer for 'argp_domain' field.
  (parse_opt): Use '_' for messages.
  (main): Likewise, and add calls to 'setlocale', 'bindtextdomain', and
  'textdomain'.
* daemon.am (guix_daemon_CPPFLAGS): Add -DLOCALEDIR.
* po/guix/Makevars (XGETTEXT_OPTIONS): Remove '--language' option.  Add
  '--keyword=n_'.
* po/guix/POTFILES.in: Add guix-daemon.cc.
 2015-06-10 21:58:16 +02:00
Ludovic Courtès 34942e9597 nls: Recognize 'N_' as equivalent to 'ngettext'. 
This fixes i18n of plural messages.

* po/guix/Makevars (XGETTEXT_OPTIONS): Change 'N_' to 'N_:1,2'.
 2014-09-29 22:03:46 +02:00
Cyril Roelandt b4f5e0e87c scripts: add guix lint 
* guix/scripts/lint.scm: New file. Defines a 'lint' tool for Guix packages.
* tests/lint.scm: New file.
* Makefile.am (MODULES, SCM_TESTS): Add them.
* po/guix/Makevars: Update appropriately.
* po/guix/POTFILES.in: Update appropriately.
* doc/guix.texi: Document "guix lint".
 2014-09-03 02:07:07 +02:00
Ludovic Courtès 599f146400 Revert "nls: Use xgettext and msgmerge with --no-wrap." 
This reverts commit 648453e8d6.

See <http://lists.gnu.org/archive/html/bug-gettext/2014-08/msg00005.html>
for the rationale.
 2014-08-12 15:46:21 +02:00
Ludovic Courtès 648453e8d6 nls: Use xgettext and msgmerge with --no-wrap. 
Suggested by Benno Schulenberg <coordinator@translationproject.org>.

* po/guix/Makevars (XGETTEXT_OPTIONS): Add --no-wrap.
  (MSGMERGE_OPTIONS): New variable.
* po/packages/Makevars (XGETTEXT_OPTIONS): Add --no-wrap.
  (MSGMERGE_OPTIONS): New variable.
 2014-06-17 00:26:32 +02:00
Ludovic Courtès ee76417972 Separate package description translations from string translations. 
* po/packages/LINGUAS, po/packages/Makevars, po/packages/POTFILES.in:
  New files.
* po/guix/Makevars (DOMAIN): Change to "guix".
  (XGETTEXT_OPTIONS): Remove "--keyword=synopsis --keyword=description".
* po/guix/POTFILES.in: Remove gnu/packages/*.scm.
* configure.ac: Change to gettext 0.18.3.  Produce
  po/packages/Makefile.in.
* Makefile.am (SUBDIRS): Add po/packages.
* guix/ui.scm (%package-text-domain): New variable.
  (P_): New procedure.
  (package->recutils): Use 'P_' instead of '_'.
* guix/scripts/package.scm (find-packages-by-description): Use 'P_'
  instead of 'gettext'.
 2014-06-13 17:30:40 +02:00
Ludovic Courtès ef1a9bb7d6 Move gettext files to 'po/guix'. 
* po: Rename to...
* po/guix: ... this.
* po/guix/Makevars (subdir, top_builddir): Adjust accordingly.
* configure.ac: Change 'po/Makefile.in' to 'po/guix/Makefile.in'.
* Makefile.am (SUBDIRS): Change 'po' to 'po/guix'.
 2014-06-13 16:31:18 +02:00
Renamed from po/Makevars (Browse further)