diff --git a/src/library/FOSSBilling/Pagination.php b/src/library/FOSSBilling/Pagination.php index dafab0fd4..c7f2d81f7 100644 --- a/src/library/FOSSBilling/Pagination.php +++ b/src/library/FOSSBilling/Pagination.php @@ -81,7 +81,7 @@ class Pagination implements InjectionAwareInterface throw new InformationException("The number of items per page ($perPageParam) must be a positive integer."); } if ($perPage > self::MAX_PER_PAGE) { - throw new InformationException("The number of items per page ($perPageParam) must be below the maximum allowed amount (" . self::MAX_PER_PAGE . ').'); + throw new InformationException("The number of items per page ($perPageParam) is too large. Please specify a smaller number."); } $offset = ($page - 1) * $perPage; @@ -143,7 +143,7 @@ class Pagination implements InjectionAwareInterface throw new InformationException("The number of items per page ($perPageParam) must be a positive integer."); } if ($perPage > self::MAX_PER_PAGE) { - throw new InformationException("The number of items per page ($perPageParam) must be below the maximum allowed amount (" . self::MAX_PER_PAGE . ').'); + throw new InformationException("The number of items per page ($perPageParam) is too large. Please specify a smaller number."); } $offset = ($page - 1) * $perPage; diff --git a/src/library/Payment/Invoice.php b/src/library/Payment/Invoice.php index cc5a1a0ff..6305fe6d7 100644 --- a/src/library/Payment/Invoice.php +++ b/src/library/Payment/Invoice.php @@ -10,7 +10,7 @@ */ class Payment_Invoice { - private $id; // FOSSBilling Invoice Id + private $id; // FOSSBilling Invoice ID private $number; // Invoice number for accounting private string $currency = 'USD'; private array $items = []; diff --git a/src/library/Server/Client.php b/src/library/Server/Client.php index 7b3483bc3..a00a242b4 100644 --- a/src/library/Server/Client.php +++ b/src/library/Server/Client.php @@ -20,7 +20,7 @@ class Server_Client private ?string $address_1 = null; private ?string $address_2 = null; private ?string $street = null; - private ?string $state = 'n/a'; + private ?string $state = 'N/A'; private ?string $country = 'US'; private ?string $city = null; private ?string $zip = null; diff --git a/src/modules/Formbuilder/html_admin/mod_formbuilder_settings.html.twig b/src/modules/Formbuilder/html_admin/mod_formbuilder_settings.html.twig index ae4e13443..2322b2ecd 100644 --- a/src/modules/Formbuilder/html_admin/mod_formbuilder_settings.html.twig +++ b/src/modules/Formbuilder/html_admin/mod_formbuilder_settings.html.twig @@ -132,8 +132,7 @@
@@ -143,10 +142,8 @@
diff --git a/src/modules/Invoice/html_admin/mod_invoice_tax.html.twig b/src/modules/Invoice/html_admin/mod_invoice_tax.html.twig index 003bdf67a..916771676 100644 --- a/src/modules/Invoice/html_admin/mod_invoice_tax.html.twig +++ b/src/modules/Invoice/html_admin/mod_invoice_tax.html.twig @@ -111,7 +111,7 @@
- + %
diff --git a/src/modules/Invoice/html_admin/mod_invoice_taxupdate.html.twig b/src/modules/Invoice/html_admin/mod_invoice_taxupdate.html.twig index 943c16c2f..bf8d1948f 100644 --- a/src/modules/Invoice/html_admin/mod_invoice_taxupdate.html.twig +++ b/src/modules/Invoice/html_admin/mod_invoice_taxupdate.html.twig @@ -23,7 +23,7 @@
- + %
diff --git a/src/modules/Invoice/html_admin/mod_invoice_transaction.html.twig b/src/modules/Invoice/html_admin/mod_invoice_transaction.html.twig index 619f5d400..5c6a0259f 100644 --- a/src/modules/Invoice/html_admin/mod_invoice_transaction.html.twig +++ b/src/modules/Invoice/html_admin/mod_invoice_transaction.html.twig @@ -56,7 +56,7 @@ {{ transaction.id }} - {{ 'Invoice Id'|trans }} + {{ 'Invoice ID'|trans }} {{ transaction.invoice_id|default('-') }} diff --git a/src/modules/Invoice/html_admin/mod_invoice_transactions.html.twig b/src/modules/Invoice/html_admin/mod_invoice_transactions.html.twig index 59d54e48e..a0a11b8ed 100644 --- a/src/modules/Invoice/html_admin/mod_invoice_transactions.html.twig +++ b/src/modules/Invoice/html_admin/mod_invoice_transactions.html.twig @@ -26,7 +26,7 @@
- +
@@ -183,7 +183,7 @@ {% if tx.invoice_id %} #{{ tx.invoice_id }} {% else %} - {{ 'n/a'|trans }} + {{ 'N/A'|trans }} {% endif %} {{ mf.status_name(tx.type|default('-')) }} diff --git a/src/modules/Invoice/html_client/mod_invoice_invoice.html.twig b/src/modules/Invoice/html_client/mod_invoice_invoice.html.twig index 5b713dd56..bb28b6444 100644 --- a/src/modules/Invoice/html_client/mod_invoice_invoice.html.twig +++ b/src/modules/Invoice/html_client/mod_invoice_invoice.html.twig @@ -193,7 +193,7 @@ - + diff --git a/src/modules/Invoice/html_client/mod_invoice_print.html.twig b/src/modules/Invoice/html_client/mod_invoice_print.html.twig index ff44a47ed..ce556c9ca 100644 --- a/src/modules/Invoice/html_client/mod_invoice_print.html.twig +++ b/src/modules/Invoice/html_client/mod_invoice_print.html.twig @@ -148,7 +148,7 @@
{{ '#'|trans }}{{ '#'|trans }} {{ 'Title'|trans }} {{ 'Price'|trans }} {{ 'Total'|trans }}
- + diff --git a/src/modules/News/html_admin/mod_news_post.html.twig b/src/modules/News/html_admin/mod_news_post.html.twig index 2660173d9..1ea0fc160 100644 --- a/src/modules/News/html_admin/mod_news_post.html.twig +++ b/src/modules/News/html_admin/mod_news_post.html.twig @@ -46,7 +46,7 @@
- +
diff --git a/src/modules/Product/html_admin/mod_product_index.html.twig b/src/modules/Product/html_admin/mod_product_index.html.twig index ac872fc6c..fe70ee107 100644 --- a/src/modules/Product/html_admin/mod_product_index.html.twig +++ b/src/modules/Product/html_admin/mod_product_index.html.twig @@ -47,7 +47,7 @@
{{ '#'|trans }}{{ '#'|trans }} {{ 'Title'|trans }} {{ 'Price'|trans }} {{ 'Total'|trans }}
- + diff --git a/src/modules/Servicehosting/html_admin/mod_servicehosting_index.html.twig b/src/modules/Servicehosting/html_admin/mod_servicehosting_index.html.twig index 351f52a8f..69a6de89a 100644 --- a/src/modules/Servicehosting/html_admin/mod_servicehosting_index.html.twig +++ b/src/modules/Servicehosting/html_admin/mod_servicehosting_index.html.twig @@ -41,7 +41,7 @@
{{ '#'|trans }}{{ '#'|trans }} {{ 'Type'|trans }} {{ 'Category'|trans }} {{ 'Title'|trans }}
- + @@ -100,7 +100,7 @@
{{ '#'|trans }}{{ '#'|trans }} {{ 'Title'|trans }} {{ 'IP'|trans }} {{ 'Server manager'|trans }}
- + @@ -188,25 +188,25 @@
- +
- +
- +
- +
diff --git a/tests-legacy/modules/Client/Api/AdminTest.php b/tests-legacy/modules/Client/Api/AdminTest.php index 0608d8fad..e05f17d69 100644 --- a/tests-legacy/modules/Client/Api/AdminTest.php +++ b/tests-legacy/modules/Client/Api/AdminTest.php @@ -262,7 +262,7 @@ class AdminTest extends \BBTestCase 'city' => 'Chicaco', 'state' => 'IL', 'currency' => 'USD', - 'tax_exempt' => 'n/a', + 'tax_exempt' => 'N/A', 'created_at' => '2012-05-10', 'email' => 'test@example.com', 'group_id' => 1, @@ -346,7 +346,7 @@ class AdminTest extends \BBTestCase 'city' => 'Chicaco', 'state' => 'IL', 'currency' => 'USD', - 'tax_exempt' => 'n/a', + 'tax_exempt' => 'N/A', 'created_at' => '2012-05-10', 'email' => 'test@example.com', 'group_id' => 1,
{{ '#'|trans }}{{ '#'|trans }} {{ 'Title'|trans }} {{ 'Addon domains'|trans }} {{ 'Disk space'|trans }}