From 33eb58c70a67cd4ff0a992a507510bd0fc48d2e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?CatFlip=E2=84=A2?= Date: Thu, 26 May 2022 22:49:01 -0500 Subject: [PATCH] Fixed sample + messages + some others --- bin/gettext_header.php | 8 ++++---- src/bb-config-sample.php | 4 ++-- src/bb-library/Box/Extension.php | 2 +- src/bb-library/Box/Mod.php | 6 +++--- src/bb-locale/en_US/LC_MESSAGES/messages.po | 8 ++++---- src/bb-locale/messages.pot | 6 +++--- src/bb-modules/Custompages/manifest.json | 4 ++-- src/bb-modules/Invoice/Service.php | 2 +- src/bb-modules/Order/Service.php | 4 ++-- src/bb-themes/admin_default/html/_sidebar.html.twig | 4 ++-- src/bb-themes/admin_default/html/layout_default.html.twig | 2 +- .../admin_default/html/mod_extension_index.html.twig | 8 ++++---- .../admin_default/html/partial_extensions.html.twig | 2 +- src/install/sql/content_test.sql | 2 +- .../Payment/Adapter/Payment_Adapter_PayPalTest.php | 2 +- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/bin/gettext_header.php b/bin/gettext_header.php index ec0601dfd..b97bdb329 100644 --- a/bin/gettext_header.php +++ b/bin/gettext_header.php @@ -1,8 +1,8 @@ \n", '2011 - '. date('Y')); + $output = "# en_US translation of FOSSBilling Application\n"; + $output .= sprintf("# Copyright %s FOSSBilling \n", '2011 - '. date('Y')); $output .= "#\n"; $output .= "#, fuzzy\n"; $output .= "msgid \"\"\n"; @@ -10,8 +10,8 @@ function _writeHeader() { $output .= "\"Project-Id-Version: 4\\n\"\n"; $output .= "\"POT-Creation-Date: " . date("Y-m-d H:iO") . "\\n\"\n"; $output .= "\"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\\n\"\n"; - $output .= "\"Last-Translator: BoxBilling TM \\n\"\n"; - $output .= "\"Language-Team: BoxBilling TM \\n\"\n"; + $output .= "\"Last-Translator: FOSSBilling TM \\n\"\n"; + $output .= "\"Language-Team: FOSSBilling TM \\n\"\n"; $output .= "\"MIME-Version: 1.0\\n\"\n"; $output .= "\"Content-Type: text/plain; charset=utf-8\\n\"\n"; $output .= "\"Content-Transfer-Encoding: 8bit\\n\"\n"; diff --git a/src/bb-config-sample.php b/src/bb-config-sample.php index 846a43c71..afa18e882 100755 --- a/src/bb-config-sample.php +++ b/src/bb-config-sample.php @@ -110,7 +110,7 @@ return [ /** * The name of the database for FOSSBilling. */ - 'name' => getenv('DB_NAME') ?: 'boxbilling', + 'name' => getenv('DB_NAME') ?: 'fossbilling', /** * Database username. @@ -174,7 +174,7 @@ return [ * @since 4.22.0 * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent */ - 'user_agent' => 'Mozilla/5.0 (RedHatEnterpriseLinux; Linux x86_64; FOSSBilling; +http://boxbilling.org) Gecko/20100101 Firefox/93.0', + 'user_agent' => 'Mozilla/5.0 (RedHatEnterpriseLinux; Linux x86_64; FOSSBilling; +https://fossbilling.org) Gecko/20100101 Firefox/93.0', /** * Default request timeout diff --git a/src/bb-library/Box/Extension.php b/src/bb-library/Box/Extension.php index 7d8ad42a3..3f5922c66 100644 --- a/src/bb-library/Box/Extension.php +++ b/src/bb-library/Box/Extension.php @@ -45,7 +45,7 @@ const TYPE_HOOK = 'hook'; const TYPE_TRANSLATION = 'translation'; - private $_url = 'https://extensions.boxbilling.org/api/'; + private $_url = 'https://extensions.fossbilling.org/api/'; public function getExtension($id, $type = Box_Extension::TYPE_MOD) { diff --git a/src/bb-library/Box/Mod.php b/src/bb-library/Box/Mod.php index e0b74c498..a371afec9 100644 --- a/src/bb-library/Box/Mod.php +++ b/src/bb-library/Box/Mod.php @@ -89,14 +89,14 @@ class Box_Mod 'type' => 'mod', 'name' => $this->mod, 'description' => NULL, - 'homepage_url' => 'https://github.com/boxbilling/', + 'homepage_url' => 'https://fossbilling.org/', 'author' => 'FOSSBilling', - 'author_url' => 'https://extensions.boxbilling.org/', + 'author_url' => 'https://extensions.fossbilling.org/', 'license' => 'N/A', 'version' => '1.0', 'icon_url' => NULL, 'download_url' => NULL, - 'project_url' => 'https://extensions.boxbilling.org/', + 'project_url' => 'https://extensions.fossbilling.org/', "minimum_boxbilling_version" => NULL, "maximum_boxbilling_version" => NULL, ); diff --git a/src/bb-locale/en_US/LC_MESSAGES/messages.po b/src/bb-locale/en_US/LC_MESSAGES/messages.po index 300501755..dc547805c 100644 --- a/src/bb-locale/en_US/LC_MESSAGES/messages.po +++ b/src/bb-locale/en_US/LC_MESSAGES/messages.po @@ -1,12 +1,12 @@ # en_US translation of FOSSBilling Application -# Copyright 2011-2021 FOSSBilling +# Copyright 2011-2021 FOSSBilling # msgid "" msgstr "" "Project-Id-Version: 4\n" "POT-Creation-Date: 2015-02-27 08:07+0000\n" "PO-Revision-Date: 2021-08-10 09:00+0300\n" -"Language-Team: FOSSBilling TM \n" +"Language-Team: FOSSBilling TM \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -5121,8 +5121,8 @@ msgid "" "FTP root - This is generally the directory in which " "FOSSBilling is installed. This setting is very important to be setup " "correctly as it very specifically depends on the Host server settings. In " -"can be just / BUT it might be htdocs/boxbilling, public_html/, /public_html/" -"boxbilling or other. It is a variable that FOSSBilling has absolutely no " +"can be just / BUT it might be htdocs/fossbilling, public_html/, /public_html/" +"fossbilling or other. It is a variable that FOSSBilling has absolutely no " "control over. You will need to clarify this with your host." msgstr "" diff --git a/src/bb-locale/messages.pot b/src/bb-locale/messages.pot index 7371ffd6b..7ef45bbed 100644 --- a/src/bb-locale/messages.pot +++ b/src/bb-locale/messages.pot @@ -1,5 +1,5 @@ # en_US translation of FOSSBilling Application -# Copyright 2011-2021 FOSSBilling +# Copyright 2011-2021 FOSSBilling # #, fuzzy msgid "" @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: 4\n" "POT-Creation-Date: 2015-02-27 08:07+0000\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" -"Last-Translator: FOSSBilling TM \n" -"Language-Team: FOSSBilling TM \n" +"Last-Translator: FOSSBilling TM \n" +"Language-Team: FOSSBilling TM \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/src/bb-modules/Custompages/manifest.json b/src/bb-modules/Custompages/manifest.json index 48b26b7b4..c6755d7e9 100644 --- a/src/bb-modules/Custompages/manifest.json +++ b/src/bb-modules/Custompages/manifest.json @@ -3,10 +3,10 @@ "type": "mod", "name": "Custom Pages", "description": "This module allows you to create custom pages.", - "homepage_url": "https://github.com/boxbilling/", + "homepage_url": "https://fossbilling.org/", "author": "FOSSBilling", "icon_url": "icon.png", - "author_url": "https://github.com/boxbilling/", + "author_url": "https://fossbilling.org/", "license": "GPL version 2 or later - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html", "version": "1.0.0" } diff --git a/src/bb-modules/Invoice/Service.php b/src/bb-modules/Invoice/Service.php index 32481ffb0..ccd2346cf 100644 --- a/src/bb-modules/Invoice/Service.php +++ b/src/bb-modules/Invoice/Service.php @@ -1187,7 +1187,7 @@ class Service implements InjectionAwareInterface $r = ($subscribe) ? $adapter->recurrentPayment($mpi) : $adapter->singlePayment($mpi); $this->di['logger']->info('Went to pay for invoice #%s via %s', $invoice->id, $gtw->gateway); - // @bug https://github.com/boxbilling/FOSSBilling/issues/108 + // @bug https://github.com/boxbilling/boxbilling/issues/108 if ('html' != $adapter->getType()) { $r = (array) $r; } diff --git a/src/bb-modules/Order/Service.php b/src/bb-modules/Order/Service.php index 88a494a41..5824492ab 100644 --- a/src/bb-modules/Order/Service.php +++ b/src/bb-modules/Order/Service.php @@ -643,7 +643,7 @@ class Service implements InjectionAwareInterface /** * activate all addons on initial activation. * - * @see https://github.com/boxbilling/FOSSBilling/issues/54 + * @see https://github.com/boxbilling/boxbilling/issues/54 */ public function activateOrderAddons(\Model_ClientOrder $order) { @@ -904,7 +904,7 @@ class Service implements InjectionAwareInterface $this->renewFromOrder($order); // activate all addons on initial activation - // @see https://github.com/boxbilling/FOSSBilling/issues/54 + // @see https://github.com/boxbilling/boxbilling/issues/54 if ($order->group_master && \Model_ClientOrder::STATUS_PENDING_SETUP == $order->status) { $list = $this->getOrderAddonsList($order); foreach ($list as $addon) { diff --git a/src/bb-themes/admin_default/html/_sidebar.html.twig b/src/bb-themes/admin_default/html/_sidebar.html.twig index da1f65878..818a19204 100644 --- a/src/bb-themes/admin_default/html/_sidebar.html.twig +++ b/src/bb-themes/admin_default/html/_sidebar.html.twig @@ -57,9 +57,9 @@
{{ 'Documentation'|trans }} - {{ 'Source code'|trans }} - {{ 'Report bug'|trans }}
diff --git a/src/bb-themes/admin_default/html/layout_default.html.twig b/src/bb-themes/admin_default/html/layout_default.html.twig index dbfa990c4..394a7a3f1 100644 --- a/src/bb-themes/admin_default/html/layout_default.html.twig +++ b/src/bb-themes/admin_default/html/layout_default.html.twig @@ -49,7 +49,7 @@
- + diff --git a/src/bb-themes/admin_default/html/mod_extension_index.html.twig b/src/bb-themes/admin_default/html/mod_extension_index.html.twig index 7cb2a920f..a8228ebf6 100644 --- a/src/bb-themes/admin_default/html/mod_extension_index.html.twig +++ b/src/bb-themes/admin_default/html/mod_extension_index.html.twig @@ -113,7 +113,7 @@

{{ 'Manual update is a solution when auto updater can not work on current installation environment'|trans }}

    -
  • Download the latest release from GitHub
    • +
  • Download the latest release from GitHub
  • Extract the files into your computer
  • Upload (overwrite) extracted files via FTP to {{ constant('BB_PATH_ROOT') }}
  • When the uploading is done, execute {{ constant('BB_URL') }}bb-update.php in your browser
    • @@ -128,14 +128,14 @@

    {{ 'FOSSBilling gives developers all the capabilities to customize, integrate & extend the core system into your own website & applications.'|trans }}

    More extensions
    -

    If you can not find extensions you are looking for in this admin area, please visit extensions site at https://extensions.boxbilling.org

    +

    If you can not find extensions you are looking for in this admin area, please visit extensions site at https://extensions.fossbilling.org

    How to create new extension
    • Create free account at Github
    • Create new public repository dedicated for extension only
      • -
    • Repository must have plugin json file. More information
      • -
    • Login to FOSSBilling extensions site with github account.
      • +
    • Repository must have plugin json file. More information
      • +
    • Login to FOSSBilling extensions site with github account.
    • If your repository contains valid json file, it can be registered in extensions site.
    • Registered extensions can be visible in every FOSSBilling admin area.
    diff --git a/src/bb-themes/admin_default/html/partial_extensions.html.twig b/src/bb-themes/admin_default/html/partial_extensions.html.twig index 57619092b..5c14c1bce 100644 --- a/src/bb-themes/admin_default/html/partial_extensions.html.twig +++ b/src/bb-themes/admin_default/html/partial_extensions.html.twig @@ -37,7 +37,7 @@ {% else %} - Explore FOSSBilling extensions + Explore FOSSBilling extensions {% endfor %} diff --git a/src/install/sql/content_test.sql b/src/install/sql/content_test.sql index 83eecc27d..cd57a70db 100644 --- a/src/install/sql/content_test.sql +++ b/src/install/sql/content_test.sql @@ -599,7 +599,7 @@ LOCK TABLES `support_helpdesk` WRITE; INSERT INTO `support_helpdesk` (`id`, `name`, `email`, `close_after`, `can_reopen`, `signature`, `created_at`, `updated_at`) VALUES - (1,'General','info@boxbilling.org',24,0,'It is always a pleasure to help.\nHave a Nice Day !','2021-01-01 12:00:00','2021-01-01 12:00:00'); + (1,'General','info@fossbilling.org',24,0,'It is always a pleasure to help.\nHave a Nice Day !','2021-01-01 12:00:00','2021-01-01 12:00:00'); /*!40000 ALTER TABLE `support_helpdesk` ENABLE KEYS */; UNLOCK TABLES; diff --git a/tests/bb-library/Payment/Adapter/Payment_Adapter_PayPalTest.php b/tests/bb-library/Payment/Adapter/Payment_Adapter_PayPalTest.php index ff3d2b3b2..7b787b18f 100644 --- a/tests/bb-library/Payment/Adapter/Payment_Adapter_PayPalTest.php +++ b/tests/bb-library/Payment/Adapter/Payment_Adapter_PayPalTest.php @@ -8,7 +8,7 @@ class Payment_Adapter_PayPalTest extends PHPUnit\Framework\TestCase { public function setup(): void { $this->defaultConfig = array( - 'email' => 'info@boxbilling.org', + 'email' => 'info@fossbilling.org', ); }