From 39d12cbb96a5a450addfb09d18a73b7cdeade79b Mon Sep 17 00:00:00 2001 From: cage <cage@invalid> Date: Sun, 22 Aug 2021 11:28:56 +0200 Subject: [PATCH] - added gempub-support in *features*; - removed generated file config.lisp.in. --- .gitignore | 1 + src/config.lisp.in | 49 ------------------------------------------- src/config.lisp.in.in | 5 +++++ 3 files changed, 6 insertions(+), 49 deletions(-) delete mode 100644 src/config.lisp.in diff --git a/.gitignore b/.gitignore index 4f5d4eb..fa5d007 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ po/*.gmo quick_quicklisp.sh src/config.lisp +src/config.lisp.in **-noshare.* diff --git a/src/config.lisp.in b/src/config.lisp.in deleted file mode 100644 index a1b0720..0000000 --- a/src/config.lisp.in +++ /dev/null @@ -1,49 +0,0 @@ - -;; This program is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. -;; If not, see [[http://www.gnu.org/licenses/][http://www.gnu.org/licenses/]]. - -(alexandria:define-constant +openssl-bin+ "/usr/bin/openssl" :test #'string=) - -(alexandria:define-constant +xdg-open-bin+ "/usr/bin/xdg-open" :test #'string=) - -(alexandria:define-constant +unzip-bin+ "/usr/bin/unzip" :test #'string=) - -(defmacro with-return-untranslated ((untranslated) &body body) - `(handler-bind ((i18n-conditions:no-translation-table-error - (lambda (e) - (declare (ignore e)) - (invoke-restart 'cl-i18n:return-untranslated)))) - (handler-case - (progn ,@body) - (i18n-conditions:no-translation (e) - (declare (ignorable e)) - #+debug-mode - (progn - (warn e) - ,untranslated) - #-debug-mode ,untranslated)))) - -(defun _ (a) - "get translated string" - (with-return-untranslated (a) - (cl-i18n:translate a))) - -(defun n_ (a b n) - "Get stranslated string with plural forms -- a the untranslated string template -- b the string template to return if no translation was found -- n the number of object mentioned in the string template" - (declare (ignore b)) - (with-return-untranslated (a) - (cl-i18n:ntranslate a a n))) diff --git a/src/config.lisp.in.in b/src/config.lisp.in.in index 4db4d58..fc2236d 100644 --- a/src/config.lisp.in.in +++ b/src/config.lisp.in.in @@ -19,6 +19,11 @@ (alexandria:define-constant +unzip-bin+ "@UNZIP@" :test #'string=) +(eval-when (:compile-toplevel :load-toplevel :execute) + (when (and (not (member :gempub-support *features*)) + (string/= +unzip-bin+ "")) + (push :gempub-support *features*))) + (defmacro with-return-untranslated ((untranslated) &body body) `(handler-bind ((i18n-conditions:no-translation-table-error (lambda (e)