Skip to content

Commit 41fb675

Browse files
authored
Merge pull request #1606 from Blair2004/v4.8.x
V4.8.x
2 parents a557fb4 + b83cf7f commit 41fb675

File tree

7 files changed

+47
-5
lines changed

7 files changed

+47
-5
lines changed

config/nexopos.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
return [
4-
'version' => '4.8.20',
4+
'version' => '4.8.21',
55
'languages' => [
66
'en' => 'English',
77
'de' => 'Deutsch',

lang/nl.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,6 @@
598598
"Amount Due": "Te betalen bedrag",
599599
"Amount Paid": "Betaald Bedrag",
600600
"See Procurements": "Zie Inkopen",
601-
"Registers List": "Registers Lijst",
602601
"Display all registers.": "Geef alle registers weer.",
603602
"No registers has been registered": "Er zijn geen registers geregistreerd",
604603
"Add a new register": "Voeg een nieuw register toe",
@@ -1208,7 +1207,7 @@
12081207
"Quotations will get deleted after they defined they has reached.": "Offertes worden verwijderd nadat ze zijn verlopen.",
12091208
"Features": "Eigenschappen",
12101209
"Show Quantity": "Toon Hoeveelheid",
1211-
"Will show the quantity selector while choosing a product. Otherwise the default quantity is set to 1.": "Toont de hoeveelheid-kiezer tijdens het kiezen van een product. Anders wordt de standaardhoeveelheid ingesteld op 1."",
1210+
"Will show the quantity selector while choosing a product. Otherwise the default quantity is set to 1.": "Toont de hoeveelheid-kiezer tijdens het kiezen van een product. Anders wordt de standaardhoeveelheid ingesteld op 1.",
12121211
"Allow Customer Creation": "Sta Klant Aanmaken toe",
12131212
"Allow customers to be created on the POS.": "Sta toe dat klanten worden aangemaakt op de POS.",
12141213
"Quick Product": "Snel Product",
@@ -1656,7 +1655,7 @@
16561655
"Modify Cash Flow.": "Wijzig Cash Flow.",
16571656
"Credit": "Krediet",
16581657
"Debit": "Debet",
1659-
"All entities attached to this category will either produce a \"credit\" or \"debit\" to the cash flow history.": "Alle eenheden die aan deze categorie zijn gekoppeld zullen ofwel een "credit" of een "debet" opleveren voor de kasstroomhistorie.",
1658+
"All entities attached to this category will either produce a \"credit\" or \"debit\" to the cash flow history.": "Alle eenheden die aan deze categorie zijn gekoppeld zullen ofwel een \"credit\" of een \"debet\" opleveren voor de kasstroomhistorie.",
16601659
"Account": "Account",
16611660
"Provide the accounting number for this category.": "Geef het rekeningnummer voor deze rubriek.",
16621661
"Unable to register using this email.": "Kan niet registreren met deze e-mail.",

lang/sq.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"Which table name should be used ? [Q] to quit.": "Cili emër tabele duhet të përdoret? [Q] për të lënë.",
99
"What slug should be used ? [Q] to quit.": "Çfarë slug duhet të përdoret? [Q] për të lënë.",
1010
"Please provide a valid value.": "Jep një vlerë të vlefshme.",
11-
"If your CRUD resource has a relation, mention it as follow \"foreign_table, foreign_key, local_key\" ? [S] to skip, [Q] to quit.": "Nëse burimi juaj CRUD ka një lidhje, përmendeni atë si vijon \"tabela_e_huajshme, çelësi_i huaj, çelësi_lokal" ? [S] për të kapërcyer, [Q] për të lënë.",
11+
"If your CRUD resource has a relation, mention it as follow \"foreign_table, foreign_key, local_key\" ? [S] to skip, [Q] to quit.": "Nëse burimi juaj CRUD ka një lidhje, përmendeni atë si vijon \"tabela_e_huajshme, çelësi_i huaj, çelësi_lokal\" ? [S] për të kapërcyer, [Q] për të lënë.",
1212
"Add a new relation ? Mention it as follow \"foreign_table, foreign_key, local_key\" ? [S] to skip, [Q] to quit.": "Shto një lidhje të re? E përmendni si vijon \"tabela_e huaj, çelësi_i huaj, çelësi_lokal\" ? [S] për të kapërcyer, [Q] për të lënë.",
1313
"The CRUD resource \"%s\" for the module \"%s\" has been generated at \"%s\"": "Burimi CRUD \"%s\" për modulin \"%s\" është krijuar në \"%s\"",
1414
"The CRUD resource \"%s\" has been generated at %s": "Burimi CRUD \"%s\" është krijuar në %s",

phpunit.ci.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<testsuites>
99
<testsuite name="Feature">
1010
<directory suffix="CreateTestDatabaseSQLite.php">./tests/Feature</directory>
11+
<directory suffix="TestLanguageFileValidity.php">./tests/Feature</directory>
1112
<directory suffix="ExceptionsTest.php">./tests/Feature</directory>
1213
<directory suffix="HardResetTest.php">./tests/Feature</directory>
1314
<directory suffix="TestAllDateTimeOptions.php">./tests/Feature</directory>

phpunit.sales.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<testsuites>
99
<testsuite name="Feature">
1010
<directory suffix="ExceptionsTest.php">./tests/Feature</directory>
11+
<directory suffix="TestLanguageFileValidity.php">./tests/Feature</directory>
1112
<directory suffix="HardResetTest.php">./tests/Feature</directory>
1213
<directory suffix="CrudTest.php">./tests/Feature</directory>
1314
<directory suffix="FieldsTest.php">./tests/Feature</directory>

phpunit.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<testsuites>
99
<testsuite name="Feature">
1010
<directory suffix="ExceptionsTest.php">./tests/Feature</directory>
11+
<directory suffix="TestLanguageFileValidity.php">./tests/Feature</directory>
1112
<directory suffix="HardResetTest.php">./tests/Feature</directory>
1213
<directory suffix="CrudTest.php">./tests/Feature</directory>
1314
<directory suffix="FieldsTest.php">./tests/Feature</directory>
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
3+
namespace Tests\Feature;
4+
5+
use Illuminate\Foundation\Testing\RefreshDatabase;
6+
use Illuminate\Foundation\Testing\WithFaker;
7+
use Illuminate\Support\Facades\Storage;
8+
use Tests\TestCase;
9+
10+
class TestLanguageFileValidity extends TestCase
11+
{
12+
/**
13+
* A basic feature test example.
14+
*
15+
* @return void
16+
*/
17+
public function test_language_validity()
18+
{
19+
$files = Storage::disk( 'ns' )->allFiles( 'lang' );
20+
21+
foreach( $files as $file ) {
22+
$content = file_get_contents( base_path( $file ) );
23+
24+
$this->assertTrue( $this->checkValidity( $content ), sprintf(
25+
'The file "%s" is not valid',
26+
$file
27+
) );
28+
}
29+
}
30+
31+
private function checkValidity( $content )
32+
{
33+
if ( ! empty( $content ) ) {
34+
@json_decode( $content );
35+
return ( json_last_error() === JSON_ERROR_NONE );
36+
}
37+
38+
return false;
39+
}
40+
}

0 commit comments

Comments
 (0)