Fixed sample + messages + some others

This commit is contained in:
CatFlip™ committed 2022-05-26 22:49:01 -05:00
1 parent b6eb86ebec
commit 33eb58c70a
15 files changed
+32 -32

No files matched your search

+4 -4
View File
@@ -1,8 +1,8 @@
<?php
function _writeHeader() {
$output = "# en_US translation of BoxBilling Application\n";
$output .= sprintf("# Copyright %s BoxBilling <info@boxbilling.org>\n", '2011 - '. date('Y'));
$output = "# en_US translation of FOSSBilling Application\n";
$output .= sprintf("# Copyright %s FOSSBilling <info@fossbilling.org>\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 <info@boxbilling.org>\\n\"\n";
$output .= "\"Language-Team: BoxBilling TM <info@boxbilling.org>\\n\"\n";
$output .= "\"Last-Translator: FOSSBilling TM <info@fossbilling.org>\\n\"\n";
$output .= "\"Language-Team: FOSSBilling TM <info@fossbilling.org>\\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";
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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)
{
+3 -3
View File
@@ -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,
);
+4 -4
View File
@@ -1,12 +1,12 @@
# en_US translation of FOSSBilling Application
# Copyright 2011-2021 FOSSBilling <info@boxbilling.org>
# Copyright 2011-2021 FOSSBilling <info@fossbilling.org>
#
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 <info@boxbilling.org>\n"
"Language-Team: FOSSBilling TM <info@fossbilling.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -5121,8 +5121,8 @@ msgid ""
"<strong>FTP root</strong> - 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 ""
+3 -3
View File
@@ -1,5 +1,5 @@
# en_US translation of FOSSBilling Application
# Copyright 2011-2021 FOSSBilling <info@boxbilling.org>
# Copyright 2011-2021 FOSSBilling <info@fossbilling.org>
#
#, 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 <info@boxbilling.org>\n"
"Language-Team: FOSSBilling TM <info@boxbilling.org>\n"
"Last-Translator: FOSSBilling TM <info@fossbilling.org>\n"
"Language-Team: FOSSBilling TM <info@fossbilling.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+2 -2
View File
@@ -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"
}
+1 -1
View File
@@ -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;
}
+2 -2
View File
@@ -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) {
@@ -57,9 +57,9 @@
<div class="dropdown-menu" data-bs-popper="none">
<a class="dropdown-item" href="https://docs.boxbilling.org/" target="_blank"
rel="noopener">{{ 'Documentation'|trans }}</a>
<a class="dropdown-item" href="https://github.com/boxbilling/boxbilling" target="_blank"
<a class="dropdown-item" href="https://github.com/FOSSBilling/FOSSBilling" target="_blank"
rel="noopener">{{ 'Source code'|trans }}</a>
<a class="dropdown-item" href="https://github.com/boxbilling/boxbilling/issues" target="_blank"
<a class="dropdown-item" href="https://github.com/FOSSBilling/FOSSBilling/issues" target="_blank"
rel="noopener">{{ 'Report bug'|trans }}</a>
</div>
</li>
@@ -49,7 +49,7 @@
<div class="navbar-nav flex-row order-md-last">
<div class="nav-item d-none d-md-flex me-3">
<div class="btn-list">
<a href="https://github.com/boxbilling/boxbilling" class="btn" target="_blank" rel="noreferrer">
<a href="https://github.com/FOSSBilling/FOSSBilling" class="btn" target="_blank" rel="noreferrer">
<svg class="icon icon-tabler icon-tabler-arrow-back-up">
<use xlink:href="#brand-github" />
</svg>
@@ -113,7 +113,7 @@
<p>{{ 'Manual update is a solution when auto updater can not work on current installation environment'|trans }}</p>
<ul>
<li>Download the latest release from <a href="https://github.com/boxbilling/boxbilling/releases" target="_blank">GitHub</a></li>
<li>Download the latest release from <a href="https://github.com/FOSSBilling/FOSSBilling/releases" target="_blank">GitHub</a></li>
<li>Extract the files into your computer</li>
<li>Upload (overwrite) extracted files via FTP to <strong>{{ constant('BB_PATH_ROOT') }}</strong></li>
<li>When the uploading is done, execute <a href="{{ constant('BB_URL') }}bb-update.php" target="_blank">{{ constant('BB_URL') }}bb-update.php</a> in your browser</li>
@@ -128,14 +128,14 @@
<p class="text-muted">{{ 'FOSSBilling gives developers all the capabilities to customize, integrate & extend the core system into your own website & applications.'|trans }}</p>
<h5>More extensions</h5>
<p>If you can not find extensions you are looking for in this admin area, please visit extensions site at <a href="https://extensions.boxbilling.org" target="_blank">https://extensions.boxbilling.org</a></p>
<p>If you can not find extensions you are looking for in this admin area, please visit extensions site at <a href="https://extensions.fossbilling.org" target="_blank">https://extensions.fossbilling.org</a></p>
<h5>How to create new extension</h5>
<ul>
<li>Create free account at <a href="https://github.com/signup/free" target="_blank">Github</a></li>
<li>Create new public repository dedicated for extension only</li>
<li>Repository must have plugin json file. <a href="https://extensions.boxbilling.org/article/getting-started" target="_blank">More information</a></li>
<li>Login to <a href="https://extensions.boxbilling.org/" target="_blank">FOSSBilling extensions site</a> with github account.</li>
<li>Repository must have plugin json file. <a href="https://extensions.fossbilling.org/article/getting-started" target="_blank">More information</a></li>
<li>Login to <a href="https://extensions.fossbilling.org/" target="_blank">FOSSBilling extensions site</a> with github account.</li>
<li>If your repository contains valid json file, it can be registered in extensions site.</li>
<li>Registered extensions can be visible in every FOSSBilling admin area.</li>
</ul>
@@ -37,7 +37,7 @@
{% else %}
<tr>
<td colspan="4" class="aligncenter">
<a href="https://extensions.boxbilling.org/" target="_blank">Explore FOSSBilling extensions</a>
<a href="https://extensions.fossbilling.org/" target="_blank">Explore FOSSBilling extensions</a>
</td>
</tr>
{% endfor %}
+1 -1
View File
@@ -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;
@@ -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',
);
}