diff --git a/.composer-require-checker.config.json b/.composer-require-checker.config.json index 0ca710b..aa3fe6d 100644 --- a/.composer-require-checker.config.json +++ b/.composer-require-checker.config.json @@ -4,7 +4,7 @@ "ctype", "date", "fileinfo", "filter", "iconv", "json", "pcre", "reflection", "session", "simplexml", "spl", "xml", - "curl", "gd", "intl", "mbstring", "mysqli", "zlib", "pdo", "pgsql", "gettext", "tidy", + "curl", "gd", "intl", "mbstring", "mysqli", "zlib", "pdo", "pgsql", "gettext", "exif", "pcntl" ], @@ -40,11 +40,15 @@ "GALETTE_TEMPIMAGES_PATH", "GALETTE_THEME", "GALETTE_THEMES_PATH", - "GALETTE_THEME_DIR", - "GALETTE_TPL_SUBDIR", "GALETTE_VERSION", "GALETTE_X_FORWARDED_FOR_INDEX", "_CURRENT_THEME_PATH", + "GALETTE_URI", + "GALETTE_MYSQL_MIN", + "GALETTE_MARIADB_MIN", + "GALETTE_PGSQL_MIN", + "GALETTE_DISPLAY_VERSION", + "GALETTE_PHP_MIN", "_T", "__", "_Tn", @@ -87,7 +91,16 @@ "DI\\autowire", "DI\\Container", "DI\\ContainerBuilder", - "DI\\Bridge\\Slim\\App" + "DI\\Bridge\\Slim\\App", + + "// Should not error (not used) but...", + "mt_rand", + "rand", + "random_int", + + + "// Not detected, do not know why.", + "Psr\\Http\\Server\\RequestHandlerInterface" ], "scan-files": [ "*.php", diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 28cefd7..6a5b3be 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - php-versions: [ '7.2', '7.3', '7.4', '8.0', '8.1' ] + php-versions: [ '8.1', '8.2' ] coverage: [none] fail-fast: false @@ -30,47 +30,43 @@ jobs: tools: composer coverage: ${{ matrix.coverage }} - - name: Checkout plugin - uses: actions/checkout@v2 - - name: Checkout Galette core - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: galette/galette path: galette-core fetch-depth: 1 ref: develop + - name: Checkout plugin + uses: actions/checkout@v3 + with: + path: galette-core/galette/plugins/plugin-paypal + - name: Get composer cache directory id: composer-cache run: | - mv composer.json.checker composer.json - echo "::set-output name=dir::$(composer config cache-files-dir)" - if: ${{ matrix.php-versions!= '7.2' && matrix.php-versions!= '7.3' }} + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} restore-keys: ${{ runner.os }}-composer- - if: ${{ matrix.php-versions!= '7.2' && matrix.php-versions!= '7.3' }} - name: Install dependencies run: | + cd galette-core/galette composer install --ignore-platform-reqs - if: ${{ matrix.php-versions!= '7.2' && matrix.php-versions!= '7.3' }} - - - name: Install CS only - run: | - composer require squizlabs/php_codesniffer - if: ${{ matrix.php-versions== '7.2' || matrix.php-versions== '7.3' }} - name: CS run: | - vendor/bin/phpcs -n -p --standard=galette-core/phpcs-rules.xml lib/ ./*.php + cd galette-core/galette/plugins/plugin-paypal + ../../vendor/bin/phpcs -n -p --standard=../../../phpcs-rules.xml lib/ ./*.php - name: Check missing symbols run: | - vendor/bin/composer-require-checker check --config-file=.composer-require-checker.config.json - if: ${{ matrix.php-versions!= '7.2' && matrix.php-versions!= '7.3' }} + cd galette-core/galette/plugins/plugin-paypal + composer require maglnet/composer-require-checker -W + vendor/bin/composer-require-checker check --config-file=.composer-require-checker.config.json ../../composer.json diff --git a/.gitignore b/.gitignore index 5ce51c3..5563c57 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ *.exvim* +dist/ +tempcache/ diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 0000000..31e1e5c --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,174 @@ +#tools: +# external_code_coverage: +# timeout: 600 # Timeout in seconds. + +build: + dependencies: + override: + - composer self-update + - git clone --depth=1 https://github.com/galette/galette -b develop galette && pushd galette + - ./bin/install_deps && popd + + nodes: + + analysis: + environment: + php: + version: 8.1 + + project_setup: + override: + - 'true' + tests: + override: + - php-scrutinizer-run + - js-scrutinizer-run + + cache: + directories: + - vendor # Cache for already installed composer package -> speed up composer install + - galette/vendor # Same ^ + - bin # As vendor directory is cached, bin directory must be also cached (as some dependency will not installed if they are already present and so, related binary will not be linked) + - ~/.composer # Composer home directory (avoid fetching already fetched packages) +filter: + excluded_paths: + - 'galette/*' + - 'tests/*' + - 'bin/*' + - '*.min.js' + dependency_paths: + - "galette/vendor/" + - "vendor/" + +checks: + php: + fix_php_opening_tag: false + remove_php_closing_tag: false + one_class_per_file: false + side_effects_or_types: false + no_mixed_inline_html: false + require_braces_around_control_structures: false + php5_style_constructor: false + no_global_keyword: false + avoid_usage_of_logical_operators: false + psr2_class_declaration: false + no_underscore_prefix_in_properties: false + no_underscore_prefix_in_methods: false + blank_line_after_namespace_declaration: false + single_namespace_per_use: false + psr2_switch_declaration: false + psr2_control_structure_declaration: false + avoid_superglobals: false + security_vulnerabilities: false + no_exit: false + fix_use_statements: + remove_unused: true + preserve_multiple: false + preserve_blanklines: true + order_alphabetically: false + javascript: true + +coding_style: + php: + indentation: + general: + use_tabs: false + size: 4 + switch: + indent_case: true + spaces: + general: + linefeed_character: newline + before_parentheses: + function_declaration: false + closure_definition: true + function_call: false + if: true + for: true + while: true + switch: true + catch: true + array_initializer: false + around_operators: + assignment: true + logical: true + equality: true + relational: true + bitwise: true + additive: true + multiplicative: true + shift: true + unary_additive: false + concatenation: true + negation: false + before_left_brace: + class: true + function: true + if: true + else: true + for: true + while: true + do: true + switch: true + try: true + catch: true + finally: true + before_keywords: + else: true + while: true + catch: true + finally: true + within: + brackets: false + array_initializer: false + grouping: false + function_call: false + function_declaration: false + if: false + for: false + while: false + switch: false + catch: false + type_cast: false + ternary_operator: + before_condition: true + after_condition: true + before_alternative: true + after_alternative: true + in_short_version: false + other: + before_comma: false + after_comma: true + before_semicolon: false + after_semicolon: true + after_type_cast: false + braces: + classes_functions: + class: undefined + function: undefined + closure: undefined + if: + opening: undefined + always: true + else_on_new_line: false + for: + opening: undefined + always: true + while: + opening: undefined + always: true + do_while: + opening: undefined + always: true + while_on_new_line: false + switch: + opening: undefined + try: + opening: undefined + catch_on_new_line: false + finally_on_new_line: false + upper_lower_casing: + keywords: + general: undefined + constants: + true_false_null: undefined diff --git a/_define.php b/_define.php index ab05e5c..515c80a 100644 --- a/_define.php +++ b/_define.php @@ -7,9 +7,9 @@ * * PHP version 5 * - * Copyright © 2011-2021 The Galette Team + * Copyright © 2011-2023 The Galette Team * - * This file is part of Galette (http://galette.tuxfamily.org). + * This file is part of Galette (https://galette.eu). * * Galette is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,20 +28,19 @@ * @package GalettePaypal * * @author Johan Cwiklinski - * @copyright 2011-2021 The Galette Team + * @copyright 2011-2023 The Galette Team * @license http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version - * @link http://galette.tuxfamily.org - * @since Available since 0.7dev - 2011-05-31 + * @link https://galette.eu */ $this->register( 'Galette Paypal', //Name 'Paypal integration', //Short description 'Johan Cwiklinski', //Author - '1.10.0', //Version - '0.9.6', //Galette compatible version + '2.0.0', //Version + '1.0.0', //Galette compatible version 'paypal', //routing name and translation domain - '2021-11-29', //Release date + '2023-12-07', //Release date [ //Permissions needed 'paypal_preferences' => 'staff', 'store_paypal_preferences' => 'staff', @@ -49,3 +48,7 @@ 'filter_paypal_history' => 'staff' ] ); + +$this->setCsrfExclusions([ + '/paypal_(success|notify|cancelled)/', +]); diff --git a/_routes.php b/_routes.php index 29db890..9325519 100644 --- a/_routes.php +++ b/_routes.php @@ -7,7 +7,7 @@ * * PHP version 5 * - * Copyright © 2016-2020 The Galette Team + * Copyright © 2016-2023 The Galette Team * * This file is part of Galette (http://galette.tuxfamily.org). * @@ -28,7 +28,7 @@ * @package GalettePaypal * * @author Johan Cwiklinski - * @copyright 2016-2020 The Galette Team + * @copyright 2016-2023 The Galette Team * @license http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version * @version SVN: $Id$ * @link http://galette.tuxfamily.org @@ -40,43 +40,43 @@ //Constants and classes from plugin require_once $module['root'] . '/_config.inc.php'; -$this->get( +$app->get( '/preferences', [PaypalController::class, 'preferences'] )->setName('paypal_preferences')->add($authenticate); -$this->post( +$app->post( '/preferences', [PaypalController::class, 'storePreferences'] )->setName('store_paypal_preferences')->add($authenticate); -$this->get( +$app->get( '/form', [PaypalController::class, 'form'] )->setName('paypal_form'); -$this->get( +$app->get( '/cancel', [PaypalController::class, 'cancel'] )->setName('paypal_cancelled'); -$this->post( +$app->post( '/success', [PaypalController::class, 'success'] )->setName('paypal_success'); -$this->post( +$app->post( '/notify', [PaypalController::class, 'notify'] )->setName('paypal_notify'); -$this->get( +$app->get( '/logs[/{option:order|reset|page}/{value}]', [PaypalController::class, 'logs'] )->setName('paypal_history')->add($authenticate); //history filtering -$this->post( +$app->post( '/history/filter', [PaypalController::class, 'filter'] )->setName('filter_paypal_history')->add($authenticate); diff --git a/_smarties.php b/_smarties.php deleted file mode 100644 index 0466b23..0000000 --- a/_smarties.php +++ /dev/null @@ -1,41 +0,0 @@ -. - * - * @category Plugins - * @package GalettePaypal - * - * @author Johan Cwiklinski - * @copyright 2011-2014 The Galette Team - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version - * @version SVN: $Id$ - * @link http://galette.tuxfamily.org - * @since Available since 0.7dev - 2011-05-31 - */ - -$_tpl_assignments = array( - 'paypal_tpl_dir' => '__plugin_templates_dir__', - 'paypal_dir' => '__plugin_dir__' -); diff --git a/bin/twig-cache b/bin/twig-cache new file mode 100755 index 0000000..73c9a6e --- /dev/null +++ b/bin/twig-cache @@ -0,0 +1,108 @@ +#!/bin/php +isDir() && !$fpath->isLink()) ? rmdir($fpath->getPathname()) : unlink($fpath->getPathname()); + } + + rmdir($path); + return true; + } + return false; +} + +/** + * Return a custom Twig cache handler. + * This handler is useful to be able to preserve filenames of compiled files. + * + * @param string $directory + * + * @return CacheInterface + */ +function getTwigCacheHandler(string $directory): CacheInterface +{ + return new class($directory) extends FilesystemCache { + + private string $directory; + + public function __construct(string $directory, int $options = 0) + { + $this->directory = rtrim($directory, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; + parent::__construct($directory, $options); + } + + public function generateKey(string $name, string $className): string + { + return $this->directory . $name; + } + }; +} + +$directory = sprintf('%s/../templates/default', __DIR__); +$cache_dir = sprintf('%s/../tempcache', __DIR__); +$cache = getTwigCacheHandler($cache_dir); +if (file_exists($cache_dir)) { + rmdir_recursive($cache_dir); +} +mkdir($cache_dir); + +$iterator = new RecursiveIteratorIterator( + new RecursiveDirectoryIterator($directory), + RecursiveIteratorIterator::LEAVES_ONLY +); + +$loader = new FilesystemLoader($directory); +$twig = new Environment( + $loader, + [ + 'cache' => $cache, + 'auto_reload' => true, + ] +); + +$twig_functions = [ + '__', + '_T', + '_Tn', + '_Tx', + '_Tnx', + 'url_for', + 'memberName', + 'callstatic', + 'is_current_url', + 'get_class', + 'base_path', + 'file_exists' +]; + +foreach ($twig_functions as $function) { + $twig->addFunction(new TwigFunction($function, $function)); +} + +/** @var SplFileInfo $file */ +foreach ($iterator as $file) { + if ($file->isFile()) { + $twig->load(str_replace($directory . '/', '', $file)); + } +} diff --git a/composer.json.checker b/composer.json.checker index 96136b5..7ddfd9c 100644 --- a/composer.json.checker +++ b/composer.json.checker @@ -6,10 +6,9 @@ } }, "require": { - "php": ">=7.3", + "php": ">=7.4", "slim/slim": "^3.0", "monolog/monolog": "^2.1", - "mathmarques/smarty-view": "^1.1", "laminas/laminas-db": "^2.11", "laminas/laminas-stdlib": "^3.3", "analog/analog": "^1.0", @@ -17,21 +16,24 @@ "tecnickcom/tcpdf": "^6.3", "akrabat/rka-slim-session-middleware": "^2.0", "laminas/laminas-i18n": "^2.11", - "laminas/laminas-cache": "^2.10", - "soundasleep/html2text": "^1.1", - "aneek/slim-event-dispatcher": "^1.0", + "soundasleep/html2text": "^2.0", "slim/flash": "^0.4.0", - "league/event": "^2.1", - "smarty/smarty": "^3.1", + "league/event": "^3.0", "psr/http-message": "^1.0", "psr/container": "^1.0", "maglnet/composer-require-checker": "^2.1", "squizlabs/php_codesniffer": "^3.5", + "friendsoftwig/twigcs": "^6.0", "php-di/slim-bridge": "2.0.0", "doctrine/annotations": "^1.8", - "laminas/laminas-servicemanager": "3.7", + "laminas/laminas-servicemanager": "^3.17", "symfony/polyfill-php80": "^1.23", "ezyang/htmlpurifier": "^4.13", - "slim/csrf": "0.8.3" + "slim/csrf": "0.8.3", + "twig/twig": "^3.3", + "slim/twig-view": "^2" + }, + "config": { + "allow-plugins": false } } diff --git a/lang/Makefile b/lang/Makefile index a065293..468dcd0 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -3,11 +3,13 @@ LANGUAGES = `find ./ -name "paypal_*.po" -print | sed 's|^\./paypal_\(.*\).po|\1 DOMAINS = paypal PHP_SOURCES = $(shell find ../ -maxdepth 1 -name \*.php) \ $(shell find ../lib/GalettePaypal/ -name \*.php) \ - $(shell find ../templates -name \*.tpl) - + $(shell find ../tempcache -name \*.twig) all : extract mo +twig : + ../bin/twig-cache + po : @echo "Generating PO files:" @for l in ${LANGUAGES}; do \ @@ -39,12 +41,9 @@ mo : done \ done -extract : ${PHP_SOURCES} Makefile - xgettext ${PHP_SOURCES} --keyword=_T:1,2t --keyword=__:1,2t --keyword=_Tn:1,2,4t --keyword=_Tx:1c,2,3t --keyword=_Tnx:1c,2,3,5t -L PHP --from-code=UTF-8 --add-comments=TRANS --force-po -o paypal_php.pot; - ../../../vendor/bin/smarty-xgettext --domain paypal -o paypal_tpl.pot ../templates/default/; \ - msgcat -o paypal.pot --use-first paypal_php.pot paypal_tpl.pot; \ - rm paypal_php.pot paypal_tpl.pot; \ +extract : twig ${PHP_SOURCES} Makefile + xgettext ${PHP_SOURCES} --keyword=_T:1,2t --keyword=__:1,2t --keyword=_Tn:1,2,4t --keyword=_Tx:1c,2,3t --keyword=_Tnx:1c,2,3,5t -L PHP --from-code=UTF-8 --add-comments=TRANS --force-po -o paypal.pot; echo "Generating en_US:" @for d in ${DOMAINS}; do \ - LANG=C msgen $$d.pot -o $${d}_en_US.po; \ + LANG=C msginit --no-translator -i $$d.pot --locale=en_US.utf8 -o $${d}_en_US.po; \ done diff --git a/lang/ar.utf8/LC_MESSAGES/paypal.mo b/lang/ar.utf8/LC_MESSAGES/paypal.mo index 7f74e8d..5e9fcc3 100644 Binary files a/lang/ar.utf8/LC_MESSAGES/paypal.mo and b/lang/ar.utf8/LC_MESSAGES/paypal.mo differ diff --git a/lang/ca.utf8/LC_MESSAGES/paypal.mo b/lang/ca.utf8/LC_MESSAGES/paypal.mo index 02d076f..613f94a 100644 Binary files a/lang/ca.utf8/LC_MESSAGES/paypal.mo and b/lang/ca.utf8/LC_MESSAGES/paypal.mo differ diff --git a/lang/de_DE.utf8/LC_MESSAGES/paypal.mo b/lang/de_DE.utf8/LC_MESSAGES/paypal.mo index 068c9d4..0e95f55 100644 Binary files a/lang/de_DE.utf8/LC_MESSAGES/paypal.mo and b/lang/de_DE.utf8/LC_MESSAGES/paypal.mo differ diff --git a/lang/en_US/LC_MESSAGES/paypal.mo b/lang/en_US/LC_MESSAGES/paypal.mo index c1e71f4..ae38b57 100644 Binary files a/lang/en_US/LC_MESSAGES/paypal.mo and b/lang/en_US/LC_MESSAGES/paypal.mo differ diff --git a/lang/es.utf8/LC_MESSAGES/paypal.mo b/lang/es.utf8/LC_MESSAGES/paypal.mo index 5c83027..7f10dfd 100644 Binary files a/lang/es.utf8/LC_MESSAGES/paypal.mo and b/lang/es.utf8/LC_MESSAGES/paypal.mo differ diff --git a/lang/fr_FR.utf8/LC_MESSAGES/paypal.mo b/lang/fr_FR.utf8/LC_MESSAGES/paypal.mo index 5a97a1c..41a5ebe 100644 Binary files a/lang/fr_FR.utf8/LC_MESSAGES/paypal.mo and b/lang/fr_FR.utf8/LC_MESSAGES/paypal.mo differ diff --git a/lang/it_IT.utf8/LC_MESSAGES/paypal.mo b/lang/it_IT.utf8/LC_MESSAGES/paypal.mo index 5167d2e..e5f4a58 100644 Binary files a/lang/it_IT.utf8/LC_MESSAGES/paypal.mo and b/lang/it_IT.utf8/LC_MESSAGES/paypal.mo differ diff --git a/lang/paypal.pot b/lang/paypal.pot index a476f7f..02fae4b 100644 --- a/lang/paypal.pot +++ b/lang/paypal.pot @@ -8,154 +8,152 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 -msgid "Paypal Settings" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 -msgid "Paypal preferences has been saved." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 -msgid "An error occurred saving paypal preferences :(" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 -msgid "Your payment has been aborted!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 -msgid "Paypal payment success" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 +msgid "Paypal Settings" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 -msgid "Your payment has been proceeded!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 +msgid "Paypal preferences has been saved." msgstr "" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 +msgid "An error occurred saving paypal preferences :(" msgstr "" -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 +msgid "Your payment has been aborted!" msgstr "" -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 +msgid "Paypal payment success" msgstr "" -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 +msgid "Your payment has been proceeded!" msgstr "" -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" msgstr "" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." msgstr "" -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" msgstr "" -#: ../templates/default/paypal_form.tpl:12 -msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" msgstr "" -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." msgstr "" -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" msgstr "" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." msgstr "" -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." msgstr "" -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." msgstr "" -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" "Please choose another option or change the amount." msgstr "" + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "" diff --git a/lang/paypal_ar.utf8.po b/lang/paypal_ar.utf8.po index dd09189..6c3b0e1 100644 --- a/lang/paypal_ar.utf8.po +++ b/lang/paypal_ar.utf8.po @@ -4,12 +4,12 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: translations@galette.eu\n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" "PO-Revision-Date: 2021-11-21 21:15+0000\n" "Last-Translator: Johan Cwiklinski \n" -"Language-Team: Arabic \n" +"Language-Team: Arabic \n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,86 +18,72 @@ msgstr "" "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Weblate 4.10-dev\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "الدفع عبر بايبال" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 msgid "Paypal Settings" msgstr "إعدادات بايبال" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 msgid "Paypal preferences has been saved." msgstr "تم حفظ تفضيلات بايبال." -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 msgid "An error occurred saving paypal preferences :(" msgstr "حدث خطأ اثناء حفظ تفضيلات بايبال :(" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 msgid "Your payment has been aborted!" msgstr "تم إبطال عملية الدفع!" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 msgid "Paypal payment success" msgstr "الدفع عبر بايبال تم بنجاح" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 msgid "Your payment has been proceeded!" msgstr "تمت معالجة الدفع!" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" -msgstr "تفضيلات بايبال" - -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" -msgstr "معرف بايبال:" - -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." -msgstr "" -"ادخل هنا هوية بايبال او بريدك الالكتروني المرتبط بحساب بايبال الخاص بك." - -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." -msgstr "خطأ: لم يتم ايجاد مقدار محدد مسبقاً." - -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "بايبال" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "إستمارة الدفع" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "تاريخ بايبال" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "مكرر" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "لا يوجد طلب او تعذر قراءة الطلب" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "طلب" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" -msgstr "إظهار/إخفاء الطلب كاملاً" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" +msgstr "إستمارة الدفع" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "الدفع عبر بايبال تم بنجاح. أدناه بعض التفاصيل:" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." @@ -105,61 +91,73 @@ msgstr "" "الدفع عبر بايبال تم بنجاح. قد تستلم بريداً الكترونياً من بايبال متضمناً " "التفاصيل." -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." -msgstr "" +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" +msgstr "تفضيلات بايبال" -#: ../templates/default/paypal_form.tpl:12 -msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." -msgstr "" +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" +msgstr "معرف بايبال:" -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" +"ادخل هنا هوية بايبال او بريدك الالكتروني المرتبط بحساب بايبال الخاص بك." -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." -msgstr "" +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." +msgstr "خطأ: لم يتم ايجاد مقدار محدد مسبقاً." -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" msgstr "" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." msgstr "" -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." msgstr "" -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." msgstr "" -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" "Please choose another option or change the amount." msgstr "" + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "مكرر" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "لا يوجد طلب او تعذر قراءة الطلب" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "طلب" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "إظهار/إخفاء الطلب كاملاً" diff --git a/lang/paypal_br.utf8.po b/lang/paypal_br.utf8.po index 8dbc1f0..bfb650a 100644 --- a/lang/paypal_br.utf8.po +++ b/lang/paypal_br.utf8.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -12,145 +12,143 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Translate Toolkit 3.0.0\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 -msgid "Paypal Settings" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 -msgid "Paypal preferences has been saved." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 -msgid "An error occurred saving paypal preferences :(" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 -msgid "Your payment has been aborted!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 -msgid "Paypal payment success" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 +msgid "Paypal Settings" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 -msgid "Your payment has been proceeded!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 +msgid "Paypal preferences has been saved." msgstr "" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 +msgid "An error occurred saving paypal preferences :(" msgstr "" -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 +msgid "Your payment has been aborted!" msgstr "" -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 +msgid "Paypal payment success" msgstr "" -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 +msgid "Your payment has been proceeded!" msgstr "" -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" msgstr "" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." msgstr "" -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" msgstr "" -#: ../templates/default/paypal_form.tpl:12 -msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" msgstr "" -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." msgstr "" -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" msgstr "" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." msgstr "" -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." msgstr "" -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." msgstr "" -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" "Please choose another option or change the amount." msgstr "" + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "" diff --git a/lang/paypal_ca.utf8.po b/lang/paypal_ca.utf8.po index aec5dac..ede4742 100644 --- a/lang/paypal_ca.utf8.po +++ b/lang/paypal_ca.utf8.po @@ -1,156 +1,181 @@ +# Carmella Andrews <26andrewsc@harriscountyschools.org>, 2021. +# Arnau Isern , 2022. +# Johan Cwiklinski , 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" +"PO-Revision-Date: 2022-07-04 07:18+0000\n" +"Last-Translator: Johan Cwiklinski \n" +"Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 3.0.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.13.1-dev\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" -msgstr "" +msgstr "Pagament Paypal" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 -msgid "Paypal Settings" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." msgstr "" +"El pagament no ha pogut funcionar: s'ha produït un error " +"(que s'ha registrat) en carregar les preferències de Paypal des de la base " +"de dades.
Si us plau, informeu el problema al personal." -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 -msgid "Paypal preferences has been saved." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 -msgid "An error occurred saving paypal preferences :(" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." msgstr "" +"L'identificador de Paypal no s'ha definit. Si us plau, demaneu a un " +"administrador que l'afegeixi des de les preferències del connector." -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 -msgid "Your payment has been aborted!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." msgstr "" +"No es poden carregar quantitats predefinides, això no és un error crític." -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 -msgid "Paypal payment success" -msgstr "" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 +msgid "Paypal Settings" +msgstr "Configuració de Paypal" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 -msgid "Your payment has been proceeded!" -msgstr "" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 +msgid "Paypal preferences has been saved." +msgstr "Les preferències de Paypal s'han desat." -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" -msgstr "" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 +msgid "An error occurred saving paypal preferences :(" +msgstr "S'ha produït un error en desar les preferències de PayPal :(" -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" -msgstr "" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 +msgid "Your payment has been aborted!" +msgstr "El vostre pagament s'ha cancel·lat!" -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." -msgstr "" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 +msgid "Paypal payment success" +msgstr "Pagament amb PayPal correcte" -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." -msgstr "" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 +msgid "Your payment has been proceeded!" +msgstr "S'ha fet el pagament!" -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" -msgstr "" +msgstr "Paypale" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" -msgstr "" - -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "" +msgstr "Història de Paypal" -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" -msgstr "" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" +msgstr "Formulari de pagament" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "" +"El vostre pagament amb PayPal s'ha realitzat correctament. A continuació es " +"mostren alguns detalls:" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." msgstr "" +"El vostre pagament amb PayPal s'ha realitzat correctament. És possible que " +"rebeu un correu de paypal amb els detalls." -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." -msgstr "" +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" +msgstr "Preferències de Paypal" -#: ../templates/default/paypal_form.tpl:12 -msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." -msgstr "" +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" +msgstr "Identificador de Paypal:" -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" +"Introduïu aquí un dels vostres ID de Paypal o adreces de correu electrònic " +"associades al vostre compte de Paypal." -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." -msgstr "" +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." +msgstr "Error: no s'han trobat quantitats predefinides." -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" -msgstr "" +msgstr "Introduïu el motiu del pagament" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" -msgstr "" +msgstr "Motiu del pagament" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" -msgstr "" +msgstr "Seleccioneu un motiu de pagament" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" -msgstr "" +msgstr "Motiu de pagament:" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." -msgstr "" +msgstr "Encara no s'ha configurat cap import predefinit." -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." -msgstr "" +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." +msgstr "Torneu al lloc web de %s per completar la vostra inscripció." -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." -msgstr "" +msgstr "Introduïu una quantitat." -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" "Please choose another option or change the amount." msgstr "" +"L'import que heu introduït és inferior a l'import mínim de l'opció " +"seleccionada.\n" +"Si us plau, trieu una altra opció o canvieu l'import." + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "duplicar" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "No hi ha cap sol·licitud o no es pot llegir la sol·licitud" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "petició" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "Mostra / amaga l'aplicació completa" + +#~ msgid "" +#~ "WARNING: If you enter an amount below, make sure that it is not lower " +#~ "than the amount of the option you've selected." +#~ msgstr "" +#~ "ADVERTIMENT: Si introduïu un import a continuació, assegureu-vos que no " +#~ "sigui inferior a l'import de l'opció que heu seleccionat." diff --git a/lang/paypal_de_DE.utf8.po b/lang/paypal_de_DE.utf8.po index bb74134..815d6f5 100644 --- a/lang/paypal_de_DE.utf8.po +++ b/lang/paypal_de_DE.utf8.po @@ -1,164 +1,180 @@ -# Johan Cwiklinski , 2020, 2021. +# Johan Cwiklinski , 2020, 2021, 2022. # moppinator , 2020. # Matthias Schmitt , 2021. # Tony Leichsenring , 2021. +# Glax , 2022. +# Der_Unterhaendler , 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: translations@galette.eu\n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" -"PO-Revision-Date: 2021-11-21 21:15+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" +"PO-Revision-Date: 2022-07-04 07:18+0000\n" "Last-Translator: Johan Cwiklinski \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.10-dev\n" +"X-Generator: Weblate 4.13.1-dev\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "PayPal Zahlung" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." +msgstr "" +"Bezahlung nicht erfolgreich: Ein Fehler ist während des " +"Ladens der Paypal-Einstellungen aufgetreten (und wurde protokolliert)." +"
Bitte kontaktieren Sie einen Mitarbeiter." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." +msgstr "" +"Paypal ID wurde nicht definiert. Bitten Sie einen Administrator diese in den " +"Plugin-Einstellungen hinzuzufügen." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." +msgstr "" +"Vordefinierte Werte konnten nicht geladen werden. Dies ist kein kritischer " +"Fehler." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 msgid "Paypal Settings" msgstr "PayPal Einstellungen" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 msgid "Paypal preferences has been saved." msgstr "PayPal Einstellungen wurden gespeichert." -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 msgid "An error occurred saving paypal preferences :(" msgstr "" "Während dem Speichern der PayPal Einstellungen ist ein Fehler aufgetreten :(" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 msgid "Your payment has been aborted!" msgstr "Ihre Bezahlung wurde abgebrochen!" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 msgid "Paypal payment success" msgstr "PayPal Bezahlung erfolgreich" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 msgid "Your payment has been proceeded!" msgstr "Ihre Zahlung wurde verarbeitet!" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" -msgstr "PayPal Einstellungen" - -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" -msgstr "" - -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." -msgstr "" - -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." -msgstr "" - -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "Paypal" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "PayPal Historie" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "Duplikat" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "Anfrage" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" -msgstr "Komplette Anfrage anzeigen/ausblenden" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" +msgstr "Zahlungsform" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" -msgstr "" -"Ihre PayPal Bezahlung war erfolgreich. Details dazu werden unten angezeigt:" +msgstr "Ihre PayPal Zahlung war erfolgreich. Details werden unten angezeigt:" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." msgstr "" +"Ihr Zahlung mit Paypal war erfolgreich. Sie erhalten eine E-Mail von Paypal " +"mit den Details." -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." -msgstr "" +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" +msgstr "PayPal Einstellungen" -#: ../templates/default/paypal_form.tpl:12 -msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" msgstr "" -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." msgstr "" -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" -msgstr "Bezahlgrund eingeben" +msgstr "Zahlgrund eingeben" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" -msgstr "Bezahlgrund" +msgstr "Zahlgrund" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" -msgstr "Wähle einen Bezahlgrund" +msgstr "Wähle einen Zahlgrund" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" -msgstr "Bezahlgrund:" +msgstr "Zahlgrund:" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." -msgstr "" +msgstr "Vorgefertigte Werte wurden noch nicht eingegeben." -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." msgstr "" -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." -msgstr "" +msgstr "Bitte geben Sie einen Wert ein." -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" "Please choose another option or change the amount." msgstr "" + +#: ../tempcache/paypal_history.html.twig:131 +#, fuzzy +msgid "duplicate" +msgstr "Duplikat" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "Keine Anfrage oder Anfrage nicht lesbar" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "Anfrage" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "Komplette Anfrage anzeigen/ausblenden" + +#~ msgid "" +#~ "WARNING: If you enter an amount below, make sure that it is not lower " +#~ "than the amount of the option you've selected." +#~ msgstr "" +#~ "WARNUNG: Wenn Sie einen Wert eingeben, stellen Sie sicher dass dieser " +#~ "nicht niedriger ist als die Option die Sie ausgewählt haben." diff --git a/lang/paypal_en_US.po b/lang/paypal_en_US.po index a70cdf9..d58808d 100644 --- a/lang/paypal_en_US.po +++ b/lang/paypal_en_US.po @@ -1,103 +1,93 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# English translations for PACKAGE package. +# Copyright (C) 2023 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Automatically generated, 2023. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" +"PO-Revision-Date: 2023-12-06 08:23+0100\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: en_US\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "Paypal payment" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." +msgstr "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" +msgstr "Our apologies for the annoyance :(" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." +msgstr "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." +msgstr "Predefined amounts cannot be loaded, that is not a critical error." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 msgid "Paypal Settings" msgstr "Paypal Settings" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 msgid "Paypal preferences has been saved." msgstr "Paypal preferences has been saved." -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 msgid "An error occurred saving paypal preferences :(" msgstr "An error occurred saving paypal preferences :(" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 msgid "Your payment has been aborted!" msgstr "Your payment has been aborted!" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 msgid "Paypal payment success" msgstr "Paypal payment success" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 msgid "Your payment has been proceeded!" msgstr "Your payment has been proceeded!" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" -msgstr "Paypal preferences" - -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" -msgstr "Paypal identifier:" - -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." -msgstr "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." - -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." -msgstr "Error: no predefined amounts found." - -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "Paypal" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "Payment form" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "Paypal History" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "duplicate" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "No request or unable to read request" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "Request" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" -msgstr "Show/hide full request" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" +msgstr "Payment form" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "Your paypal payment was successful. Some details are shown below:" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." @@ -105,66 +95,56 @@ msgstr "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." -msgstr "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" +msgstr "Paypal preferences" + +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" +msgstr "Paypal identifier:" -#: ../templates/default/paypal_form.tpl:12 +#: ../tempcache/paypal_preferences.html.twig:81 msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." - -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." -msgstr "Predefined amounts cannot be loaded, that is not a critical error." +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." -msgstr "Go back to %s's website to complete your inscription." +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." +msgstr "Error: no predefined amounts found." -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" msgstr "Enter payment reason" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" msgstr "Payment reason" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" msgstr "Select an payment reason" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" msgstr "Payment reason:" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." msgstr "No predefined amounts have been configured yet." -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." -msgstr "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." +msgstr "Go back to %s's website to complete your inscription." -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." msgstr "Please enter an amount." -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" @@ -173,3 +153,19 @@ msgstr "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" "Please choose another option or change the amount." + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "duplicate" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "No request or unable to read request" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "Request" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "Show/hide full request" diff --git a/lang/paypal_es.utf8.po b/lang/paypal_es.utf8.po index 12fdfd2..874dda9 100644 --- a/lang/paypal_es.utf8.po +++ b/lang/paypal_es.utf8.po @@ -3,105 +3,98 @@ # Joaquin Gonzalez , 2021. # Nicolás S. Gómez , 2021. # Berto Te , 2021. -# Johan Cwiklinski , 2021. +# Johan Cwiklinski , 2021, 2022. +# gallegonovato , 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: translations@galette.eu\n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" -"PO-Revision-Date: 2021-11-21 21:15+0000\n" -"Last-Translator: Johan Cwiklinski \n" -"Language-Team: Spanish \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" +"PO-Revision-Date: 2022-10-17 00:57+0000\n" +"Last-Translator: gallegonovato \n" +"Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.10-dev\n" +"X-Generator: Weblate 4.15-dev\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "Pago a través de Paypal" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." +msgstr "" +"Payment coult not work: Se produjo un error (que se ha " +"registrado) al cargar las preferencias de Paypal desde database.
Informe " +"el problema al personal." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" +msgstr "Nuestras disculpas por las molestias :(" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." +msgstr "" +"La identificación de Paypal no ha sido definida. Por favor, pide a un " +"administrador que lo añada desde las preferencias de los plugins." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." +msgstr "" +"No se pueden cargar cantidades predefinidas. Esto no es un error crítico." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 msgid "Paypal Settings" msgstr "Ajustes de Paypal" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 msgid "Paypal preferences has been saved." msgstr "Las preferencias de Paypal se han guardado." -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 msgid "An error occurred saving paypal preferences :(" msgstr "Ocurrió un error al guardar las preferencias de Paypal :(" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 msgid "Your payment has been aborted!" msgstr "¡Tu pago ha sido abortado!" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 msgid "Paypal payment success" msgstr "Éxito del pago de Paypal" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 msgid "Your payment has been proceeded!" msgstr "¡Tu pago ha sido procesado!" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" -msgstr "Preferencias de Paypal" - -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" -msgstr "Identificador de Paypal:" - -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." -msgstr "" -"Ingresa tu Paypal ID o tu dirección de email asociada a tu cuenta de Paypal." - -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." -msgstr "Error: no se han encontrado cantidades predefinidas." - -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "Paypal" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "Método de pago" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "Historico de Paypal" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "duplicado" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "No hay solicitud o no se pudo leer la solicitud" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "Solicitud" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" -msgstr "Mostrar/ocultar la solicitud completa" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" +msgstr "Método de pago" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "" "Tu pago con PayPal se realizó correctamente. A continuación se muestran " "algunos detalles:" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." @@ -109,67 +102,55 @@ msgstr "" "Tu pago por paypal fue exitoso. Puede que recibas un correo de paypal con " "los detalles." -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." -msgstr "" -"Payment coult not work: Se produjo un error (que se ha " -"registrado) al cargar las preferencias de Paypal desde database.
Informe " -"el problema al personal." +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" +msgstr "Preferencias de Paypal" -#: ../templates/default/paypal_form.tpl:12 -msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." -msgstr "" -"La identificación de Paypal no ha sido definida. Por favor, pide a un " -"administrador que lo añada desde las preferencias de los plugins." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" +msgstr "Identificador de Paypal:" -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" -"No se pueden cargar cantidades predefinidas. Esto no es un error crítico." +"Ingresa tu Paypal ID o tu dirección de email asociada a tu cuenta de Paypal." -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." -msgstr "Vuelva a la página web de %s para completar su inscripción." +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." +msgstr "Error: no se han encontrado cantidades predefinidas." -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" msgstr "Introduzca el motivo del pago" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" msgstr "Razón del pago" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" msgstr "Seleccione un motivo de pago" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" msgstr "Razón del pago:" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." msgstr "Aún no se ha configurado una cantidad predefinida." -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." -msgstr "" -"ADVERTENCIA: Si ingresas una cantidad abajo, asegúrate de que no sea menor " -"que la cantidad de la opción que has seleccionado." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." +msgstr "Vuelva a la página web de %s para completar su inscripción." -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." msgstr "Por favor, introduzca una cantidad." -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" @@ -178,3 +159,26 @@ msgstr "" "El monto que ha ingresado es menor que el monto mínimo para la opción " "seleccionada.\n" "Por favor, elija otra opción o cambie el monto." + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "duplicado" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "No hay solicitud o no se pudo leer la solicitud" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "Solicitud" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "Mostrar/ocultar la solicitud completa" + +#~ msgid "" +#~ "WARNING: If you enter an amount below, make sure that it is not lower " +#~ "than the amount of the option you've selected." +#~ msgstr "" +#~ "ADVERTENCIA: Si ingresas una cantidad abajo, asegúrate de que no sea " +#~ "menor que la cantidad de la opción que has seleccionado." diff --git a/lang/paypal_fr_FR.utf8.po b/lang/paypal_fr_FR.utf8.po index 25be006..2379548 100644 --- a/lang/paypal_fr_FR.utf8.po +++ b/lang/paypal_fr_FR.utf8.po @@ -1,107 +1,99 @@ # Header entry was created by Lokalize. # # , 2013. -# Johan Cwiklinski , 2020, 2021. +# Johan Cwiklinski , 2020, 2021, 2022, 2023. msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: translations@galette.eu\n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" -"PO-Revision-Date: 2021-11-21 21:14+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" +"PO-Revision-Date: 2023-07-08 06:13+0000\n" "Last-Translator: Johan Cwiklinski \n" -"Language-Team: French \n" +"Language-Team: French \n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.10-dev\n" +"X-Generator: Weblate 5.0-dev\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "Paiement Paypal" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." +msgstr "" +"Le paiement ne peut fonctionner : une erreur (qui a été " +"enregistrée) est survenue lors du chargement des préférences Paypal depuis " +"la base de données.
Merci de rapporter ce problème aux membres du bureau." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" +msgstr "Toutes nos excuses pour le désagrément :(" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." +msgstr "" +"L'identifiant Paypal n'a pas été renseigné. Veuillez demander à un " +"administrateur de l'ajouter dans les préférences du plugin." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." +msgstr "" +"Les montants prédéfinis n'ont pas pu être chargés, cette erreur n'est pas " +"crtitique." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 msgid "Paypal Settings" msgstr "Préférences Paypal" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 msgid "Paypal preferences has been saved." msgstr "Les préférences Paypal ont été sauvegardées." -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 msgid "An error occurred saving paypal preferences :(" msgstr "" "Une erreur est survenue lors de l'enregistrement des préférences paypal :(" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 msgid "Your payment has been aborted!" msgstr "Votre paiement a été annulé !" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 msgid "Paypal payment success" msgstr "Paiement Paypal effectué" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 msgid "Your payment has been proceeded!" msgstr "Votre paiement a été effectué !" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" -msgstr "Préférences Paypal" - -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" -msgstr "Identifiant Paypal :" - -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." -msgstr "" -"Entrez ici votre identifiant Paypal ou une adresse email associée à votre " -"compte paypal." - -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." -msgstr "Erreur : aucun montant prédéfini trouvé." - -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "Paypal" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "Formulaire de paiement" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "Historique Paypal" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "dupliquer" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "Pas de requête ou impossible de lire la requête" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "Requête" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" -msgstr "Afficher/Masquer la requête complète" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" +msgstr "Formulaire de paiement" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "" "Votre paiement paypal a été effectué avec succès. Quelques détails " "concernant la transaction sont affichés ci-dessous :" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." @@ -109,68 +101,56 @@ msgstr "" "Votre paiement paypal a été effectué avec succès. Vous devriez recevoir un " "courriel de paypal en contenant les détails." -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." -msgstr "" -"Le paiement ne peut fonctionner : une erreur (qui a été " -"enregistrée) est survenue lors du chargement des préférences Paypal depuis " -"la base de données.
Merci de rapporter ce problème aux membres du bureau." +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" +msgstr "Préférences Paypal" -#: ../templates/default/paypal_form.tpl:12 -msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." -msgstr "" -"L'identifiant Paypal n'a pas été renseigné. Veuillez demander à un " -"administrateur de l'ajouter dans les préférences du plugin." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" +msgstr "Identifiant Paypal :" -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" -"Les montants prédéfinis n'ont pas pu être chargés, cette erreur n'est pas " -"crtitique." +"Entrez ici votre identifiant Paypal ou une adresse email associée à votre " +"compte paypal." -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." -msgstr "Retour au site de %s pour compléter votre inscription." +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." +msgstr "Erreur : aucun montant prédéfini trouvé." -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" msgstr "Entrez un motif de paiement" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" msgstr "Motif de paiement" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" msgstr "Sélectionnez un motif de paiement" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" -msgstr "Motif de paiement :" +msgstr "Motif de paiement :" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." msgstr "Aucun montant prédéfini n'a encore été configuré." -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." -msgstr "" -"ATTENTION : si vous entrez un montant ci-dessous, assurez-vous qu'il ne soit " -"pas inférieur au montant de l'option que vous avez sélectionnée." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." +msgstr "Retour au site de %s pour compléter votre inscription." -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." msgstr "Veuillez entrer un montant." -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" @@ -180,6 +160,29 @@ msgstr "" "sélectionnée.\n" "Veuillez choisir une autre option ou entrer un nouveau montant." +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "dupliquer" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "Pas de requête ou impossible de lire la requête" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "Requête" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "Afficher/Masquer la requête complète" + +#~ msgid "" +#~ "WARNING: If you enter an amount below, make sure that it is not lower " +#~ "than the amount of the option you've selected." +#~ msgstr "" +#~ "ATTENTION : si vous entrez un montant ci-dessous, assurez-vous qu'il ne " +#~ "soit pas inférieur au montant de l'option que vous avez sélectionnée." + #~ msgid "Save" #~ msgstr "Sauvegarder" @@ -243,9 +246,6 @@ msgstr "" #~ msgid "annual fee" #~ msgstr "Cotisation annuelle" -#~ msgid "Our apologies for the annoyance :(" -#~ msgstr "Toutes nos excuses pour le désagrément :(" - #~ msgid "Validate" #~ msgstr "Valider" diff --git a/lang/paypal_it_IT.utf8.po b/lang/paypal_it_IT.utf8.po index cba2617..c0a8496 100644 --- a/lang/paypal_it_IT.utf8.po +++ b/lang/paypal_it_IT.utf8.po @@ -1,106 +1,98 @@ # Giacomo Alessandroni , 2020. # Luca De Filippo , 2021. # Lory ~ , 2021. -# Johan Cwiklinski , 2021. +# Johan Cwiklinski , 2021, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: translations@galette.eu\n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" -"PO-Revision-Date: 2021-11-21 21:15+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" +"PO-Revision-Date: 2022-07-04 07:18+0000\n" "Last-Translator: Johan Cwiklinski \n" -"Language-Team: Italian \n" +"Language-Team: Italian \n" "Language: it_IT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.10-dev\n" +"X-Generator: Weblate 4.13.1-dev\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "Pagamento Paypal" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." +msgstr "" +"Il pagamento non è andato a buon fine: si è verificato un " +"errore (che è stato registrato) durante il caricamento delle preferenze di " +"Paypal dal database.
Si prega di segnalare il problema allo staff." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." +msgstr "" +"L'ID Paypal non è stato definito. Chiedi a un amministratore di aggiungerlo " +"dalle preferenze del plugin." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." +msgstr "" +"Gli importi predefiniti non possono essere caricati, questo non è un errore " +"critico." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 msgid "Paypal Settings" msgstr "Impostazioni Paypal" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 msgid "Paypal preferences has been saved." msgstr "Le preferenze Paypal sono state salvate." -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 msgid "An error occurred saving paypal preferences :(" msgstr "Errore durante il salvataggio delle preferenze Paypal :(" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 msgid "Your payment has been aborted!" msgstr "Il tuo pagamento non è andato a buon fine!" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 msgid "Paypal payment success" msgstr "Pagamento Paypal effettuato" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 msgid "Your payment has been proceeded!" msgstr "Il tuo pagamento è stato elaborato!" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" -msgstr "Preferenze Paypal" - -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" -msgstr "Identificativo Paypal:" - -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." -msgstr "" -"Inserisci qui un tuo Paypal ID o l'indirizzo email associato al tuo account " -"paypal." - -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." -msgstr "Errore: importi predefiniti non trovati." - -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "Paypal" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "Modulo di pagamento" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "Cronologia Paypal" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "duplicato" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "Nessuna richiesta o impossibile esaminare la richiesta" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "Richiesta" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" -msgstr "Mostra/nascondi richiesta completa" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" +msgstr "Modulo di pagamento" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "" "Il tuo pagamento paypal è stato eseguito. Alcuni dettagli sono mostrati di " "seguito:" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." @@ -108,73 +100,84 @@ msgstr "" "Il tuo pagamento paypal è stato eseguito. Riceverai una mail da paypal con i " "dettagli." -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." -msgstr "" -"Il pagamento non è andato a buon fine: si è verificato un " -"errore (che è stato registrato) durante il caricamento delle preferenze di " -"Paypal dal database.
Si prega di segnalare il problema allo staff." +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" +msgstr "Preferenze Paypal" -#: ../templates/default/paypal_form.tpl:12 -msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." -msgstr "" -"L'ID Paypal non è stato definito. Chiedi a un amministratore di aggiungerlo " -"dalle preferenze del plugin." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" +msgstr "Identificativo Paypal:" -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" -"Gli importi predefiniti non possono essere caricati, questo non è un errore " -"critico." +"Inserisci qui un tuo Paypal ID o l'indirizzo email associato al tuo account " +"paypal." -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." -msgstr "Ritorna al sito di %s per completare la tua iscrizione." +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." +msgstr "Errore: importi predefiniti non trovati." -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" msgstr "Inserisci la causale del pagamento" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" msgstr "Causale del pagamento" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" msgstr "Seleziona una causale del pagamento" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" msgstr "Causale del pagamento:" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." msgstr "Non sono stati ancora configurati importi predefiniti." -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." -msgstr "" -"ATTENZIONE: se inserisci un importo minore, assicurati che non sia inferiore " -"all'importo dell'opzione selezionata." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." +msgstr "Ritorna al sito di %s per completare la tua iscrizione." -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." msgstr "Per favore, inserisci un importo." -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" "Please choose another option or change the amount." msgstr "" -"L'importo inserito è inferiore all'importo minimo per l'opzione selezionata." -"\n" +"L'importo inserito è inferiore all'importo minimo per l'opzione " +"selezionata.\n" "Scegli un'altra opzione o modifica l'importo." + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "duplicato" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "Nessuna richiesta o impossibile esaminare la richiesta" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "Richiesta" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "Mostra/nascondi richiesta completa" + +#~ msgid "" +#~ "WARNING: If you enter an amount below, make sure that it is not lower " +#~ "than the amount of the option you've selected." +#~ msgstr "" +#~ "ATTENZIONE: se inserisci un importo minore, assicurati che non sia " +#~ "inferiore all'importo dell'opzione selezionata." diff --git a/lang/paypal_nb_NO.utf8.po b/lang/paypal_nb_NO.utf8.po index 777ddb9..f7be2aa 100644 --- a/lang/paypal_nb_NO.utf8.po +++ b/lang/paypal_nb_NO.utf8.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -12,145 +12,143 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Translate Toolkit 3.0.0\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 -msgid "Paypal Settings" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 -msgid "Paypal preferences has been saved." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 -msgid "An error occurred saving paypal preferences :(" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 -msgid "Your payment has been aborted!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 -msgid "Paypal payment success" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 +msgid "Paypal Settings" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 -msgid "Your payment has been proceeded!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 +msgid "Paypal preferences has been saved." msgstr "" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 +msgid "An error occurred saving paypal preferences :(" msgstr "" -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 +msgid "Your payment has been aborted!" msgstr "" -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 +msgid "Paypal payment success" msgstr "" -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 +msgid "Your payment has been proceeded!" msgstr "" -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" msgstr "" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." msgstr "" -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" msgstr "" -#: ../templates/default/paypal_form.tpl:12 -msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" msgstr "" -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." msgstr "" -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" msgstr "" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." msgstr "" -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." msgstr "" -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." msgstr "" -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" "Please choose another option or change the amount." msgstr "" + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "" diff --git a/lang/paypal_oc.utf8.po b/lang/paypal_oc.utf8.po index 00de7d1..f71e1cd 100644 --- a/lang/paypal_oc.utf8.po +++ b/lang/paypal_oc.utf8.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" "PO-Revision-Date: 2020-06-30 21:03+0000\n" "Last-Translator: Quentin PAGÈS \n" "Language-Team: Occitan 1;\n" "X-Generator: Weblate 4.2-dev\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 -msgid "Paypal Settings" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 -msgid "Paypal preferences has been saved." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 -msgid "An error occurred saving paypal preferences :(" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 -msgid "Your payment has been aborted!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 -msgid "Paypal payment success" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 +msgid "Paypal Settings" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 -msgid "Your payment has been proceeded!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 +msgid "Paypal preferences has been saved." msgstr "" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 +msgid "An error occurred saving paypal preferences :(" msgstr "" -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 +msgid "Your payment has been aborted!" msgstr "" -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 +msgid "Paypal payment success" msgstr "" -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 +msgid "Your payment has been proceeded!" msgstr "" -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "Paypal" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" msgstr "" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." msgstr "" -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" msgstr "" -#: ../templates/default/paypal_form.tpl:12 -msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" msgstr "" -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." msgstr "" -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" msgstr "" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." msgstr "" -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." msgstr "" -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." msgstr "" -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" "Please choose another option or change the amount." msgstr "" + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "" diff --git a/lang/paypal_ota.utf8.po b/lang/paypal_ota.utf8.po index 48ea388..cfb9839 100644 --- a/lang/paypal_ota.utf8.po +++ b/lang/paypal_ota.utf8.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -12,145 +12,143 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Translate Toolkit 3.3.6\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 -msgid "Paypal Settings" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 -msgid "Paypal preferences has been saved." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 -msgid "An error occurred saving paypal preferences :(" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 -msgid "Your payment has been aborted!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 -msgid "Paypal payment success" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 +msgid "Paypal Settings" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 -msgid "Your payment has been proceeded!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 +msgid "Paypal preferences has been saved." msgstr "" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 +msgid "An error occurred saving paypal preferences :(" msgstr "" -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 +msgid "Your payment has been aborted!" msgstr "" -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 +msgid "Paypal payment success" msgstr "" -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 +msgid "Your payment has been proceeded!" msgstr "" -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" msgstr "" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." msgstr "" -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" msgstr "" -#: ../templates/default/paypal_form.tpl:12 -msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" msgstr "" -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." msgstr "" -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" msgstr "" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." msgstr "" -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." msgstr "" -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." msgstr "" -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" "Please choose another option or change the amount." msgstr "" + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "" diff --git a/lang/paypal_ru.utf8.po b/lang/paypal_ru.utf8.po new file mode 100644 index 0000000..e01d292 --- /dev/null +++ b/lang/paypal_ru.utf8.po @@ -0,0 +1,158 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 +msgid "Paypal payment" +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 +msgid "Paypal Settings" +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 +msgid "Paypal preferences has been saved." +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 +msgid "An error occurred saving paypal preferences :(" +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 +msgid "Your payment has been aborted!" +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 +msgid "Paypal payment success" +msgstr "" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 +msgid "Your payment has been proceeded!" +msgstr "" + +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 +msgid "Paypal" +msgstr "" + +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 +msgid "Paypal History" +msgstr "" + +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" +msgstr "" + +#: ../tempcache/paypal_success.html.twig:54 +msgid "Your paypal payment was successful. Some details are shown below:" +msgstr "" + +#: ../tempcache/paypal_success.html.twig:114 +msgid "" +"Your paypal payment was successful. You may receive a mail from paypal with " +"details." +msgstr "" + +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" +msgstr "" + +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" +msgstr "" + +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." +msgstr "" + +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." +msgstr "" + +#: ../tempcache/paypal_form.html.twig:66 +msgid "Enter payment reason" +msgstr "" + +#: ../tempcache/paypal_form.html.twig:73 +msgid "Payment reason" +msgstr "" + +#: ../tempcache/paypal_form.html.twig:80 +msgid "Select an payment reason" +msgstr "" + +#: ../tempcache/paypal_form.html.twig:176 +msgid "Payment reason:" +msgstr "" + +#: ../tempcache/paypal_form.html.twig:193 +msgid "No predefined amounts have been configured yet." +msgstr "" + +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." +msgstr "" + +#: ../tempcache/paypal_form.html.twig:312 +msgid "Please enter an amount." +msgstr "" + +#: ../tempcache/paypal_form.html.twig:318 +msgid "" +"The amount you've entered is lower than the minimum amount for the selected " +"option.\n" +"Please choose another option or change the amount." +msgstr "" + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "" diff --git a/lang/paypal_si.utf8.po b/lang/paypal_si.utf8.po index 6bfd7e3..67f0e41 100644 --- a/lang/paypal_si.utf8.po +++ b/lang/paypal_si.utf8.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -12,145 +12,143 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Translate Toolkit 3.3.6\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 -msgid "Paypal Settings" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 -msgid "Paypal preferences has been saved." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 -msgid "An error occurred saving paypal preferences :(" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 -msgid "Your payment has been aborted!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 -msgid "Paypal payment success" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 +msgid "Paypal Settings" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 -msgid "Your payment has been proceeded!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 +msgid "Paypal preferences has been saved." msgstr "" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 +msgid "An error occurred saving paypal preferences :(" msgstr "" -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 +msgid "Your payment has been aborted!" msgstr "" -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 +msgid "Paypal payment success" msgstr "" -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 +msgid "Your payment has been proceeded!" msgstr "" -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" msgstr "" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." msgstr "" -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" msgstr "" -#: ../templates/default/paypal_form.tpl:12 -msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" msgstr "" -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." msgstr "" -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" msgstr "" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." msgstr "" -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." msgstr "" -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." msgstr "" -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" "Please choose another option or change the amount." msgstr "" + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "" diff --git a/lang/paypal_tr.utf8.po b/lang/paypal_tr.utf8.po index f01ba21..c7a181e 100644 --- a/lang/paypal_tr.utf8.po +++ b/lang/paypal_tr.utf8.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -12,145 +12,143 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Translate Toolkit 3.3.6\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 -msgid "Paypal Settings" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 -msgid "Paypal preferences has been saved." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 -msgid "An error occurred saving paypal preferences :(" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 -msgid "Your payment has been aborted!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 -msgid "Paypal payment success" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 +msgid "Paypal Settings" msgstr "" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 -msgid "Your payment has been proceeded!" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 +msgid "Paypal preferences has been saved." msgstr "" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 +msgid "An error occurred saving paypal preferences :(" msgstr "" -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 +msgid "Your payment has been aborted!" msgstr "" -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 +msgid "Paypal payment success" msgstr "" -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 +msgid "Your payment has been proceeded!" msgstr "" -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" msgstr "" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." msgstr "" -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" msgstr "" -#: ../templates/default/paypal_form.tpl:12 -msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" msgstr "" -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "" +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." msgstr "" -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" msgstr "" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" msgstr "" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." msgstr "" -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." msgstr "" -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." msgstr "" -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" "Please choose another option or change the amount." msgstr "" + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "" diff --git a/lang/paypal_uk.utf8.po b/lang/paypal_uk.utf8.po index c07164c..e9a7692 100644 --- a/lang/paypal_uk.utf8.po +++ b/lang/paypal_uk.utf8.po @@ -1,104 +1,95 @@ # Prosta4okua , 2020. # Tymofij Lytvynenko , 2021. -# Johan Cwiklinski , 2021. +# Johan Cwiklinski , 2021, 2022. +# Artem , 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: translations@galette.eu\n" -"POT-Creation-Date: 2021-11-21 22:11+0100\n" -"PO-Revision-Date: 2021-11-21 21:15+0000\n" -"Last-Translator: Johan Cwiklinski \n" -"Language-Team: Ukrainian \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-12-06 08:23+0100\n" +"PO-Revision-Date: 2022-07-29 14:15+0000\n" +"Last-Translator: Artem \n" +"Language-Team: Ukrainian \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.10-dev\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.14-dev\n" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:89 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:90 msgid "Paypal payment" msgstr "Платіж PayPal" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:205 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:101 +msgid "" +"Payment could not work: An error occurred (that has been " +"logged) while loading Paypal preferences from database.
Please report " +"the issue to the staff." +msgstr "" +"Платіж не спрацював: Сталася помилка (яка була записана в " +"журнал) під час завантаження параметрів Paypal з бази даних. Повідомте про " +"проблему співробітникам." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:102 +msgid "Our apologies for the annoyance :(" +msgstr "Наші вибачення за прикрість :(" + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:109 +msgid "" +"Paypal id has not been defined. Please ask an administrator to add it from " +"plugin preferences." +msgstr "" +"Ідентифікатор Paypal не визначено. Будь ласка, попросіть адміністратора " +"додати його з налаштувань розширення." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:116 +msgid "Predefined amounts cannot be loaded, that is not a critical error." +msgstr "Зумовлені суми не можуть бути завантажені, що не є критичною помилкою." + +#: ../lib/GalettePaypal/Controllers/PaypalController.php:228 msgid "Paypal Settings" msgstr "Налаштування Paypal" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:249 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:272 msgid "Paypal preferences has been saved." msgstr "Налаштування Paypal збережено." -#: ../lib/GalettePaypal/Controllers/PaypalController.php:255 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:278 msgid "An error occurred saving paypal preferences :(" msgstr "Під час збереження налаштувань PayPal сталася помилка :(" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:277 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:300 msgid "Your payment has been aborted!" msgstr "Ваш платіж перервано!" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:302 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:325 msgid "Paypal payment success" msgstr "Платіж Paypal виконано успішно" -#: ../lib/GalettePaypal/Controllers/PaypalController.php:308 +#: ../lib/GalettePaypal/Controllers/PaypalController.php:331 msgid "Your payment has been proceeded!" msgstr "Ваш платіж продовжено!" -#: ../templates/default/paypal_preferences.tpl:12 -msgid "Paypal preferences" -msgstr "Налаштування PayPal" - -#: ../templates/default/paypal_preferences.tpl:15 -msgid "Paypal identifier:" -msgstr "Ідентифікатор PayPal:" - -#: ../templates/default/paypal_preferences.tpl:16 -msgid "" -"Enter here one of your Paypal ID or email adress associated within your " -"paypal account." -msgstr "" -"Уведіть тут один з ваших Paypal ID або адресу е-пошти, пов'язаний з вашим " -"рахунком Paypal." - -#: ../templates/default/paypal_preferences.tpl:48 -msgid "Error: no predefined amounts found." -msgstr "Помилка: заздалегідь визначені суми не знайдені." - -#: ../templates/default/menu.tpl:1 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:71 msgid "Paypal" msgstr "PayPal" -#: ../templates/default/menu.tpl:3 ../templates/default/public_menu.tpl:4 -msgid "Payment form" -msgstr "Форма платежу" - -#: ../templates/default/menu.tpl:5 +#: ../lib/GalettePaypal/PluginGalettePaypal.php:75 msgid "Paypal History" msgstr "Історія Paypal" -#: ../templates/default/paypal_history.tpl:55 -msgid "duplicate" -msgstr "подвоєння" - -#: ../templates/default/paypal_history.tpl:68 -msgid "No request or unable to read request" -msgstr "Немає запиту або неможливо прочитати запит" - -#: ../templates/default/paypal_history.tpl:84 -msgid "Request" -msgstr "Запит" - -#: ../templates/default/paypal_history.tpl:107 -msgid "Show/hide full request" -msgstr "Показ/ховання повного запиту" +#: ../lib/GalettePaypal/PluginGalettePaypal.php:102 +msgid "Payment form" +msgstr "Форма платежу" -#: ../templates/default/paypal_success.tpl:4 +#: ../tempcache/paypal_success.html.twig:54 msgid "Your paypal payment was successful. Some details are shown below:" msgstr "Ваш платіж PayPal був успішним. Деякі подробиці наведені нижче:" -#: ../templates/default/paypal_success.tpl:28 +#: ../tempcache/paypal_success.html.twig:114 msgid "" "Your paypal payment was successful. You may receive a mail from paypal with " "details." @@ -106,66 +97,56 @@ msgstr "" "Ваш платіж PayPal був успішним. Ви можете отримати лист із PayPal із " "подробицями." -#: ../templates/default/paypal_form.tpl:6 -msgid "" -"Payment coult not work: An error occured (that has been " -"logged) while loading Paypal preferences from database.
Please report " -"the issue to the staff." -msgstr "" -"Платіж не спрацював: Сталася помилка (яка була записана в " -"журнал) під час завантаження параметрів Paypal з бази даних. Повідомте про " -"проблему співробітникам." +#: ../tempcache/paypal_preferences.html.twig:71 +msgid "Paypal preferences" +msgstr "Налаштування PayPal" + +#: ../tempcache/paypal_preferences.html.twig:81 +msgid "Paypal identifier:" +msgstr "Ідентифікатор PayPal:" -#: ../templates/default/paypal_form.tpl:12 +#: ../tempcache/paypal_preferences.html.twig:81 msgid "" -"Paypal id has not been defined. Please ask an administrator to add it from " -"plugin preferences." +"Enter here one of your Paypal ID or email adress associated within your " +"paypal account." msgstr "" -"Ідентифікатор Paypal не визначено. Будь ласка, попросіть адміністратора " -"додати його з налаштувань розширення." - -#: ../templates/default/paypal_form.tpl:18 -msgid "Predefined amounts cannot be loaded, that is not a critical error." -msgstr "Зумовлені суми не можуть бути завантажені, що не є критичною помилкою." +"Уведіть тут один з ваших Paypal ID або адресу е-пошти, пов'язаний з вашим " +"рахунком Paypal." -#: ../templates/default/paypal_form.tpl:43 -#, php-format -msgid "Go back to %s's website to complete your inscription." -msgstr "Поверніться на сайт %s, щоб заповнити своє написання." +#: ../tempcache/paypal_preferences.html.twig:163 +msgid "Error: no predefined amounts found." +msgstr "Помилка: заздалегідь визначені суми не знайдені." -#: ../templates/default/paypal_form.tpl:48 +#: ../tempcache/paypal_form.html.twig:66 msgid "Enter payment reason" msgstr "Уведіть причину платежу" -#: ../templates/default/paypal_form.tpl:50 +#: ../tempcache/paypal_form.html.twig:73 msgid "Payment reason" msgstr "Причина платежу" -#: ../templates/default/paypal_form.tpl:52 +#: ../tempcache/paypal_form.html.twig:80 msgid "Select an payment reason" msgstr "Оберіть причину платежу" -#: ../templates/default/paypal_form.tpl:70 +#: ../tempcache/paypal_form.html.twig:176 msgid "Payment reason:" msgstr "Причина платежу:" -#: ../templates/default/paypal_form.tpl:75 +#: ../tempcache/paypal_form.html.twig:193 msgid "No predefined amounts have been configured yet." msgstr "Попередньо визначені суми ще не налаштовано." -#: ../templates/default/paypal_form.tpl:81 -msgid "" -"WARNING: If you enter an amount below, make sure that it is not lower than " -"the amount of the option you've selected." -msgstr "" -"УВАГА: Якщо ви введете суму нижче, переконайтеся, що вона не менша за " -"кількість вибраного варіанту." +#: ../tempcache/paypal_form.html.twig:268 +#, php-format +msgid "Go back to %s's website to complete your inscription." +msgstr "Поверніться на сайт %s, щоб заповнити своє написання." -#: ../templates/default/paypal_form.tpl:121 +#: ../tempcache/paypal_form.html.twig:312 msgid "Please enter an amount." msgstr "Уведіть суму." -#: ../templates/default/paypal_form.tpl:124 +#: ../tempcache/paypal_form.html.twig:318 msgid "" "The amount you've entered is lower than the minimum amount for the selected " "option.\n" @@ -173,3 +154,26 @@ msgid "" msgstr "" "Уведена сума нижча за мінімальну для обраного варіанту.\n" "Виберіть інший варіант або змініть суму." + +#: ../tempcache/paypal_history.html.twig:131 +msgid "duplicate" +msgstr "подвоєння" + +#: ../tempcache/paypal_history.html.twig:173 +msgid "No request or unable to read request" +msgstr "Немає запиту або неможливо прочитати запит" + +#: ../tempcache/paypal_history.html.twig:217 +msgid "Request" +msgstr "Запит" + +#: ../tempcache/paypal_history.html.twig:260 +msgid "Show/hide full request" +msgstr "Показ/ховання повного запиту" + +#~ msgid "" +#~ "WARNING: If you enter an amount below, make sure that it is not lower " +#~ "than the amount of the option you've selected." +#~ msgstr "" +#~ "УВАГА: Якщо ви введете суму нижче, переконайтеся, що вона не менша за " +#~ "кількість вибраного варіанту." diff --git a/lang/ru.utf8/LC_MESSAGES/paypal.mo b/lang/ru.utf8/LC_MESSAGES/paypal.mo new file mode 100644 index 0000000..4979069 Binary files /dev/null and b/lang/ru.utf8/LC_MESSAGES/paypal.mo differ diff --git a/lang/uk.utf8/LC_MESSAGES/paypal.mo b/lang/uk.utf8/LC_MESSAGES/paypal.mo index 4d958e0..025d781 100644 Binary files a/lang/uk.utf8/LC_MESSAGES/paypal.mo and b/lang/uk.utf8/LC_MESSAGES/paypal.mo differ diff --git a/lib/GalettePaypal/Controllers/PaypalController.php b/lib/GalettePaypal/Controllers/PaypalController.php index 46c3cc0..f6167cf 100644 --- a/lib/GalettePaypal/Controllers/PaypalController.php +++ b/lib/GalettePaypal/Controllers/PaypalController.php @@ -7,7 +7,7 @@ * * PHP version 5 * - * Copyright © 2020 The Galette Team + * Copyright © 2020-2023 The Galette Team * * This file is part of Galette (http://galette.tuxfamily.org). * @@ -28,7 +28,7 @@ * @package GalettePaypal * * @author Johan Cwiklinski - * @copyright 2020 The Galette Team + * @copyright 2020-2023 The Galette Team * @license http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version * @link http://galette.tuxfamily.org * @since 2020-12-12 @@ -37,6 +37,7 @@ namespace GalettePaypal\Controllers; use Analog\Analog; +use DI\Attribute\Inject; use Galette\Controllers\AbstractPluginController; use Galette\Entity\Adherent; use Galette\Entity\Contribution; @@ -45,8 +46,8 @@ use Galette\Filters\HistoryList; use GalettePaypal\Paypal; use GalettePaypal\PaypalHistory; -use Slim\Http\Request; -use Slim\Http\Response; +use Slim\Psr7\Request; +use Slim\Psr7\Response; /** * Galette paypal plugin controller @@ -55,7 +56,7 @@ * @name PaypalController * @package Galette * @author Johan Cwiklinski - * @copyright 2020 The Galette Team + * @copyright 2020-2023 The Galette Team * @license http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version * @link http://galette.tuxfamily.org * @since 2020-12-12 @@ -64,9 +65,9 @@ class PaypalController extends AbstractPluginController { /** - * @Inject("Plugin Galette Paypal") - * @var integer + * @var array */ + #[Inject("Plugin Galette Paypal")] protected $module_info; /** @@ -94,10 +95,32 @@ public function form(Request $request, Response $response): Response $params['custom'] = $this->login->id; } - // display page + if (!$paypal->isLoaded()) { + $this->flash->addMessageNow( + 'error', + _T("Payment could not work: An error occurred (that has been logged) while loading Paypal preferences from database.
Please report the issue to the staff.", "paypal") . + '
' . _T("Our apologies for the annoyance :(", "paypal") + ); + } + + if ($paypal->getId() == null) { + $this->flash->addMessageNow( + 'error', + _T("Paypal id has not been defined. Please ask an administrator to add it from plugin preferences.", "paypal") + ); + } + + if (!$paypal->areAmountsLoaded()) { + $this->flash->addMessageNow( + 'warning', + _T("Predefined amounts cannot be loaded, that is not a critical error.", "paypal") + ); + } + + // display page $this->view->render( $response, - 'file:[' . $this->getModuleRoute() . ']paypal_form.tpl', + $this->getTemplate('paypal_form'), $params ); return $response; @@ -137,7 +160,7 @@ public function logs(Request $request, Response $response, string $option = null //assign pagination variables to the template and add pagination links $paypal_history->setFilters($filters); $logs = $paypal_history->getPaypalHistory(); - $filters->setSmartyPagination($this->router, $this->view->getSmarty()); + $filters->setViewPagination($this->routeparser, $this->view); $params = [ 'page_title' => _T("Paypal History"), @@ -151,7 +174,7 @@ public function logs(Request $request, Response $response, string $option = null // display page $this->view->render( $response, - 'file:[' . $this->getModuleRoute() . ']paypal_history.tpl', + $this->getTemplate('paypal_history'), $params ); return $response; @@ -180,7 +203,7 @@ public function filter(Request $request, Response $response): Response return $response ->withStatus(301) - ->withHeader('Location', $this->router->pathFor('paypal_history')); + ->withHeader('Location', $this->routeparser->urlFor('paypal_history')); } /** @@ -210,7 +233,7 @@ public function preferences(Request $request, Response $response): Response // display page $this->view->render( $response, - 'file:[' . $this->getModuleRoute() . ']paypal_preferences.tpl', + $this->getTemplate('paypal_preferences'), $params ); return $response; @@ -259,7 +282,7 @@ public function storePreferences(Request $request, Response $response): Response return $response ->withStatus(301) - ->withHeader('Location', $this->router->pathFor('paypal_preferences')); + ->withHeader('Location', $this->routeparser->urlFor('paypal_preferences')); } /** @@ -278,7 +301,7 @@ public function cancel(Request $request, Response $response): Response ); return $response ->withStatus(301) - ->withHeader('Location', $this->router->pathFor('paypal_form')); + ->withHeader('Location', $this->routeparser->urlFor('paypal_form')); } /** @@ -351,7 +374,7 @@ public function success(Request $request, Response $response): Response // display page $this->view->render( $response, - 'file:[' . $this->getModuleRoute() . ']paypal_success.tpl', + $this->getTemplate('paypal_success'), $params ); return $response; diff --git a/lib/GalettePaypal/Paypal.php b/lib/GalettePaypal/Paypal.php index 68fd943..c78d17f 100644 --- a/lib/GalettePaypal/Paypal.php +++ b/lib/GalettePaypal/Paypal.php @@ -11,7 +11,7 @@ * * PHP version 5 * - * Copyright © 2011-2014 The Galette Team + * Copyright © 2011-2023 The Galette Team * * This file is part of Galette (http://galette.tuxfamily.org). * @@ -31,7 +31,7 @@ * @category Classes * @package GalettePaypal * @author Johan Cwiklinski - * @copyright 2011-2014 The Galette Team + * @copyright 2011-2023 The Galette Team * @license http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version * @version SVN: $Id$ * @link http://galette.tuxfamily.org @@ -52,7 +52,7 @@ * @name Paypal * @package Galette * @author Johan Cwiklinski - * @copyright 2011-2014 The Galette Team + * @copyright 2011-2023 The Galette Team * @license http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version * @link http://galette.tuxfamily.org * @since Available since 0.7dev - 2011-06-03 @@ -144,6 +144,7 @@ private function loadAmounts() try { $results = $this->zdb->selectAll(PAYPAL_PREFIX . self::TABLE); + $results = $results->toArray(); //check if all types currently exists in paypal table if (count($results) != count($this->prices)) { @@ -160,9 +161,9 @@ private function loadAmounts() if (count($results) > 0) { //for each entry in types, we want to get the associated amount foreach ($results as $paypal) { - if ($paypal->id_type_cotis == $k) { + if ($paypal['id_type_cotis'] == $k) { $_found = true; - $this->prices[$k]['amount'] = (double)$paypal->amount; + $this->prices[$k]['amount'] = (double)$paypal['amount']; break; } } diff --git a/lib/GalettePaypal/PluginGalettePaypal.php b/lib/GalettePaypal/PluginGalettePaypal.php new file mode 100644 index 0000000..136b5a5 --- /dev/null +++ b/lib/GalettePaypal/PluginGalettePaypal.php @@ -0,0 +1,154 @@ +. + * + * @category Plugins + * @package GalettePaypal + * + * @author Johan Cwiklinski + * @copyright 2022 The Galette Team + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version + * @version SVN: $Id$ + * @link http://galette.tuxfamily.org + * @since Available since 0.7.4dev - 2012-10-04 + */ + +namespace GalettePaypal; + +use Galette\Entity\Adherent; +use Galette\Core\GalettePlugin; + +/** + * Galette Paypal plugin + * + * @category Plugins + * @name PluginGalettePaypal + * @package GalettePaypal + * @author Johan Cwiklinski + * @copyright 2022 The Galette Team + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version + * @link http://galette.tuxfamily.org + * @since Available since 0.7.4dev - 2012-10-04 + */ + +class PluginGalettePaypal extends GalettePlugin +{ + /** + * Extra menus entries + * + * @return array|array[] + */ + public static function getMenusContents(): array + { + /** @var Login $login */ + global $login; + $menus = []; + + if ($login->isAdmin() || $login->isStaff()) { + $menus['plugin_paypal'] = [ + 'title' => _T("Paypal", "paypal"), + 'icon' => 'paypal', + 'items' => [ + [ + 'label' => _T("Paypal History", "paypal"), + 'route' => [ + 'name' => 'paypal_history' + ] + ], + [ + 'label' => _T("Preferences"), + 'route' => [ + 'name' => 'paypal_preferences' + ] + ] + ] + ]; + } + + return $menus; + } + + /** + * Extra public menus entries + * + * @return array|array[] + */ + public static function getPublicMenusItemsList(): array + { + return [ + [ + 'label' => _T("Payment form", "paypal"), + 'route' => [ + 'name' => 'paypal_form' + ], + 'icon' => 'paypal' + ] + ]; + } + + /** + * Get dashboards contents + * + * @return array|array[] + */ + public static function getDashboardsContents(): array + { + return []; + } + + /** + * Get actions contents + * + * @param Adherent $member Member instance + * + * @return array|array[] + */ + public static function getListActionsContents(Adherent $member): array + { + return []; + } + + /** + * Get detailed actions contents + * + * @param Adherent $member Memebr instance + * + * @return array|array[] + */ + public static function getDetailedActionsContents(Adherent $member): array + { + return static::getListActionsContents($member); + } + + /** + * Get batch actions contents + * + * @return array|array[] + */ + public static function getBatchActionsContents(): array + { + return []; + } +} diff --git a/templates/default/headers.html.twig b/templates/default/headers.html.twig new file mode 100644 index 0000000..2ebe2c3 --- /dev/null +++ b/templates/default/headers.html.twig @@ -0,0 +1 @@ + diff --git a/templates/default/headers.tpl b/templates/default/headers.tpl deleted file mode 100644 index ff966d3..0000000 --- a/templates/default/headers.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - $module_id, "path" => "galette_paypal.css"]}"/> - diff --git a/templates/default/menu.tpl b/templates/default/menu.tpl deleted file mode 100644 index 4e712cb..0000000 --- a/templates/default/menu.tpl +++ /dev/null @@ -1,8 +0,0 @@ -

{_T string="Paypal" domain="paypal"}

- diff --git a/templates/default/paypal_form.html.twig b/templates/default/paypal_form.html.twig new file mode 100644 index 0000000..b5dcc00 --- /dev/null +++ b/templates/default/paypal_form.html.twig @@ -0,0 +1,113 @@ +{% extends not login.isLogged() ? "public_page.html.twig" : "page.html.twig" %} + +{% block content %} + {% if paypal.isLoaded() and paypal.getId() != null %} +
+
+ {% if amounts|length == 0 %} + {{ _T("Enter payment reason", "paypal") }} + {% elseif amounts|length == 1%} + {{ _T("Payment reason", "paypal") }} + {% elseif amounts|length > 1 %} + {{ _T("Select an payment reason", "paypal") }} + {% endif %} +
+
+
+
+ {% if paypal.areAmountsLoaded() %} + {% if amounts|length > 0 %} + + {% for k, amount in amounts %} + {% if loop.index0 != 0 %}
{% endif %} + + + {% endfor %} + {% else %} + + + {% endif %} + {% else %} + {{ _T("No predefined amounts have been configured yet.", "paypal") }} + {% endif %} +
+ + {% include "components/forms/text.html.twig" with { + id: 'amount', + value: amounts|length > 0 ? amounts|first.amount : 20, + label: _T("Amount"), + required: true + } %} +
+
+ +
+ + {# To read more about variables, see https://cms.paypal.com/es/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_html_Appx_websitestandard_htmlvariables#id08A6HI0709B #} + + {% if custom is defined %} + + {% endif %} + + + {# language of the login or sign-up page #}{# FIXME: parameter #} + {# transaction currency #}{# FIXME: parameter? #} + + + + {# #} + + + {# Send POST values back to Galette after payment. Will be sent to return url above #} + + + + + +
+
+ {% endif %} +{% endblock %} + +{% block javascripts %} + {% if paypal.isLoaded() and paypal.getId() is not null and paypal.areAmountsLoaded() %} + + {% endif %} +{% endblock %} diff --git a/templates/default/paypal_form.tpl b/templates/default/paypal_form.tpl deleted file mode 100644 index 5ef04ba..0000000 --- a/templates/default/paypal_form.tpl +++ /dev/null @@ -1,134 +0,0 @@ -{extends file="page.tpl"} -{block name="content"} -{if !$paypal->isLoaded()} -
-

{_T string="- ERROR -"}

-

{_T string="Payment coult not work: An error occured (that has been logged) while loading Paypal preferences from database.
Please report the issue to the staff." domain="paypal"}

-

{_T string="Our apologies for the annoyance :("}

-
-{elseif $paypal->getId() eq null} -
-

{_T string="- ERROR -"}

-

{_T string="Paypal id has not been defined. Please ask an administrator to add it from plugin preferences." domain="paypal"}

-
-{else} - {if !$paypal->areAmountsLoaded()} -
-

{_T string="- WARNING -"}

-

{_T string="Predefined amounts cannot be loaded, that is not a critical error." domain="paypal"}

-
- {/if} -
-
- {* To read more about variables, see https://cms.paypal.com/es/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_html_Appx_websitestandard_htmlvariables#id08A6HI0709B *} - - {if isset($custom)} - - {/if} - - - {*language of the login or sign-up page*}{* FIXME: parameter *} - {*transaction currency*}{* FIXME: parameter? *} - - - - {**} - - - {*Send POST values back to Galette after payment. Will be sent to return url above*} - - - - - pref_nom}"/> - -
- - {if $amounts|@count eq 0} - {_T string="Enter payment reason" domain="paypal"} - {elseif $amounts|@count eq 1} - {_T string="Payment reason" domain="paypal"} - {elseif $amounts|@count gt 1} - {_T string="Select an payment reason" domain="paypal"} - {/if} - - - {if $paypal->areAmountsLoaded()} -
- {if $amounts|@count gt 0} - - {foreach from=$amounts key=k item=amount name=amounts} - {if $smarty.foreach.amounts.index != 0}
{/if} - - - {/foreach} - {else} - - - {/if} -
- {else} -

{_T string="No predefined amounts have been configured yet." domain="paypal"}

- {/if} - -

- {if $paypal->areAmountsLoaded() and $amounts|@count gt 0} - - {/if} -

-

- - -

-
- -
- -
-
-
-{/if} -{/block} - -{block name="javascripts"} -{if $paypal->isLoaded() and $paypal->getId() neq null and $paypal->areAmountsLoaded()} - -{/if} -{/block} diff --git a/templates/default/paypal_history.html.twig b/templates/default/paypal_history.html.twig new file mode 100644 index 0000000..daa7d49 --- /dev/null +++ b/templates/default/paypal_history.html.twig @@ -0,0 +1,94 @@ +{% extends 'elements/list.html.twig' %} + +{% set nb = logs|length %} +{% set filters = paypal_history.filters %} + +{% set form = { + 'order': { + 'name': "paypal_history" + } +} %} + +{% block infoline %} + {% set infoline = { + 'label': _Tn("%count entry", "%count entries", nb)|replace({"%count": nb}), + 'route': { + 'name': 'filter_paypal_history' + } + } %} + {{ parent() }} +{% endblock %} + +{% block header %} + {% set columns = [ + {'label': '#'}, + {'label': _T("Date"), 'order': constant("Galette\\Filters\\HistoryList::ORDERBY_DATE")}, + {'label': _T("Name")}, + {'label': _T("Subject")}, + {'label': _T("Amount")} + ] %} + {{ parent() }} +{% endblock %} + +{% block body %} + {% for log in logs %} + + + {{ loop.index }} + + {{ _T("History entry %id")|replace({'%id': loop.index}) }} + + + + {% if log.duplicate is defined %}{{ _T({% endif %} + {{ log.history_date|date(_T("Y-m-d H:i:s")) }} + + + {% if log.request is iterable %} + {% if log.request.custom is defined %} + + {% endif %} + {{ log.request.last_name }} {{ log.request.first_name }} + {% if log.request.custom is defined%} + + {% endif %} + {% else %} + {{ _T("No request or unable to read request", "paypal") }} + {% endif %} + + + {% if log.request is iterable %} + {{ log.request.item_name }} + {% endif %} + + + {% if log.request is iterable%} + {{ log.request.mc_gross }} + {% endif %} + + + + + {{ _T("Request", "paypal") }} + 
{{ log.raw_request }}
+ + {% else %} + {{ _T("logs are empty") }} + {% endfor %} +{% endblock %} + +{% block javascripts %} + +{% endblock %} diff --git a/templates/default/paypal_history.tpl b/templates/default/paypal_history.tpl deleted file mode 100644 index 9d3e473..0000000 --- a/templates/default/paypal_history.tpl +++ /dev/null @@ -1,114 +0,0 @@ -{extends file="page.tpl"} -{block name="content"} - - - - - - - - - - - - - - - -{foreach from=$logs item=log name=eachlog} - - - - - - - - - - - - -{foreachelse} - -{/foreach} - -
-
- - - - - {include file="forms_types/csrf.tpl"} - -
-
# - "order", "value" => "Galette\Filters\HistoryList::ORDERBY_DATE"|constant]}"> - {_T string="Date"} - {if $paypal_history->filters->orderby eq constant('Galette\Filters\HistoryList::ORDERBY_DATE')} - {if $paypal_history->filters->getDirection() eq constant('Galette\Filters\HistoryList::ORDER_ASC')} - {_T string= - {else} - {_T string= - {/if} - {/if} - - - {_T string="Name"} - - {_T string="Subject"} - - {_T string="Amount"} -
- {$smarty.foreach.eachlog.iteration} - - {_T string="History entry %id" pattern="/%id/" replace=$smarty.foreach.eachlog.iteration} - - - {if isset($log.duplicate)} $module_id, "path" => "images/warning.png"]}" alt="{_T string="duplicate" domain="paypal"}"/>{/if} - {$log.history_date|date_format:"%a %d/%m/%Y - %R"} - - {if is_array($log.request)} - {if isset($log.request.custom)} - $log.request.custom]}"> - {/if} - {$log.request.last_name} {$log.request.first_name} - {if isset($log.request.custom)} - - {/if} - {else} - {_T string="No request or unable to read request" domain="paypal"} - {/if} - - {if is_array($log.request)} - {$log.request.item_name} - {/if} - - {if is_array($log.request)} - {$log.request.mc_gross} - {/if} -
{_T string="Request" domain="paypal"}
{$log.raw_request}
{_T string="logs are empty"}
-{if $logs|@count != 0} -
- {_T string="Pages:"}
-
    {$pagination}
-
-{/if} -{/block} - -{block name="javascripts"} - -{/block} diff --git a/templates/default/paypal_preferences.html.twig b/templates/default/paypal_preferences.html.twig new file mode 100644 index 0000000..d5f5443 --- /dev/null +++ b/templates/default/paypal_preferences.html.twig @@ -0,0 +1,66 @@ +{% extends 'page.html.twig' %} + +{% block content %} +
+ {% if not paypal.isLoaded() %} +
+

{{ _T("- ERROR -") }}

+
+ {% endif %} +
+
+ + {{ _T("Paypal preferences", "paypal") }} +
+
+ {% if login.isAdmin() %} + {% include "components/forms/text.html.twig" with { + id: 'paypal_id', + value: paypal.getId(), + label: _T("Paypal identifier:", "paypal"), + required: true, + tip: _T("Enter here one of your Paypal ID or email adress associated within your paypal account.", "paypal") + } %} + {% endif %} + + {% if paypal.areAmountsLoaded() and amounts|length > 0 %} + + + + + + + + + + {% for k, amount in amounts %} + + + + + + {% endfor %} + +
{{ _T("Contribution type") }}{{ _T("Amount") }}{{ _T("Inactive") }}
+ + + + + + +
+ {% else %} +

{{ _T("Error: no predefined amounts found.", "paypal") }}

+ {% endif %} +
+
+ +
+ + + {% include "components/forms/csrf.html.twig" %} +
+
+{% endblock %} diff --git a/templates/default/paypal_preferences.tpl b/templates/default/paypal_preferences.tpl deleted file mode 100644 index 27a1747..0000000 --- a/templates/default/paypal_preferences.tpl +++ /dev/null @@ -1,58 +0,0 @@ -{extends file="page.tpl"} -{block name="content"} -
-{if !$paypal->isLoaded()} -
-

{_T string="- ERROR -"}

-
-{/if} -
- -
- {_T string="Paypal preferences" domain="paypal"} -{if $login->isAdmin()} -

- - {_T string="Enter here one of your Paypal ID or email adress associated within your paypal account." domain="paypal"} - -

-{/if} -{if $paypal->areAmountsLoaded() and $amounts|@count gt 0} - - - - - - - - - - {foreach from=$amounts key=k item=amount} - - - - - - {/foreach} - -
{_T string="Contribution type"}{_T string="Amount"}{_T string="Inactive"}
- - - - - - isInactive($k)} checked="checked"{/if} value="{$k}"/> -
-
-{else} -

{_T string="Error: no predefined amounts found." domain="paypal"}

-{/if} - -
-
- - {include file="forms_types/csrf.tpl"} -
-

{_T string="NB : The mandatory fields are in"} {_T string="red"}

-
-{/block} diff --git a/templates/default/paypal_success.html.twig b/templates/default/paypal_success.html.twig new file mode 100644 index 0000000..871d989 --- /dev/null +++ b/templates/default/paypal_success.html.twig @@ -0,0 +1,31 @@ +{% extends 'page.html.twig' %} + +{% block content %} + {% if post %} +

{{ _T("Your paypal payment was successful. Some details are shown below:", "paypal") }}

+ + + + + + + + + + + + + + + + + + + + + +
{{ _T("Label") }}{{ post.item_name }}
{{ _T("Payment date") }}{{ post.payment_date }}
{{ _T("Payment status") }}{{ post.payment_status }}
{{ _T("Payment type") }}{{ post.payment_type }}
{{ _T("Amount") }}{{ post.mc_gross }} {{ post.mc_currency }}
+ {% else %} +

{{ _T("Your paypal payment was successful. You may receive a mail from paypal with details.", "paypal") }}

+ {% endif %} +{% endblock %} diff --git a/templates/default/paypal_success.tpl b/templates/default/paypal_success.tpl deleted file mode 100644 index 61d079a..0000000 --- a/templates/default/paypal_success.tpl +++ /dev/null @@ -1,30 +0,0 @@ -{extends file="page.tpl"} -{block name="content"} -{if $post} -

{_T string="Your paypal payment was successful. Some details are shown below:" domain="paypal"}

- - - - - - - - - - - - - - - - - - - - - -
{_T string="Label"}{$post.item_name}
{_T string="Payment date"}{$post.payment_date}
{_T string="Payment status"}{$post.payment_status}
{_T string="Payment type"}{$post.payment_type}
{_T string="Amount"}{$post.mc_gross} {$post.mc_currency}
-{else} -

{_T string="Your paypal payment was successful. You may receive a mail from paypal with details." domain="paypal"}

-{/if} -{/block} diff --git a/templates/default/public_menu.tpl b/templates/default/public_menu.tpl deleted file mode 100644 index cb72d9a..0000000 --- a/templates/default/public_menu.tpl +++ /dev/null @@ -1,6 +0,0 @@ - {if $public_page} - - - {_T string="Payment form" domain="paypal"} - - {/if}