Skip to content

New export options for PHP files #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

New export options for PHP files #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ composer.phar
composer.lock
.DS_Store
.idea
.phpunit.result.cache
.phpunit.cache
.phpunit.result.cache
.php-cs-fixer.cache
106 changes: 56 additions & 50 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,59 @@
{
"name": "barryvdh/laravel-translation-manager",
"description": "Manage Laravel Translations",
"keywords": [
"laravel",
"translations",
"translator"
],
"license": "MIT",
"authors": [
{
"name": "Barry vd. Heuvel",
"email": "[email protected]"
}
],
"require": {
"php": ">=7.2",
"illuminate/support": "^9|^10",
"illuminate/translation": "^9|^10",
"symfony/finder": "^6"
},
"require-dev": {
"orchestra/testbench": "^7|^8"
},
"suggest": {
"tanmuhittin/laravel-google-translate": "If you want to translate using Google API"
},
"autoload": {
"psr-4": {
"Barryvdh\\TranslationManager\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Barryvdh\\TranslationManager\\Tests\\": "tests/"
}
},
"extra": {
"branch-alias": {
"dev-master": "0.6-dev"
"name": "barryvdh/laravel-translation-manager",
"description": "Manage Laravel Translations",
"keywords": [
"laravel",
"translations",
"translator"
],
"license": "MIT",
"authors": [
{
"name": "Barry vd. Heuvel",
"email": "[email protected]"
},
{
"name": "Jose Vicente Orts Romero",
"email": "[email protected]"
}
],
"require": {
"php": ">=7.2",
"brick/varexporter": "^0.3.0",
"illuminate/support": "^9|^10",
"illuminate/translation": "^9|^10",
"symfony/finder": "^6"
},
"laravel": {
"providers": [
"Barryvdh\\TranslationManager\\ManagerServiceProvider"
]
}
},
"scripts": {
"test": "phpunit"
},
"minimum-stability": "dev",
"prefer-stable": true
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.46.0",
"orchestra/testbench": "^7|^8"
},
"suggest": {
"tanmuhittin/laravel-google-translate": "If you want to translate using Google API"
},
"autoload": {
"psr-4": {
"Barryvdh\\TranslationManager\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Barryvdh\\TranslationManager\\Tests\\": "tests/"
}
},
"extra": {
"branch-alias": {
"dev-master": "0.6-dev"
},
"laravel": {
"providers": [
"Barryvdh\\TranslationManager\\ManagerServiceProvider"
]
}
},
"scripts": {
"test": "phpunit"
},
"minimum-stability": "dev",
"prefer-stable": true
}
9 changes: 8 additions & 1 deletion config/translation-manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,16 @@
'$trans.get',
],

/**
/*
* Database connection name to allow for different db connection for the translations table.
*/
'db_connection' => env('TRANSLATION_MANAGER_DB_CONNECTION', null),

/*
* Extra options during the exportations
*/
'export-options' => [
'use-old-format' => false,
'has-sub-folders' => true,
],
];
52 changes: 41 additions & 11 deletions src/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use Brick\VarExporter\VarExporter;
use Symfony\Component\Finder\Finder;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Contracts\Events\Dispatcher;
Expand All @@ -13,13 +14,21 @@

class Manager
{
const JSON_GROUP = '_json';
public const JSON_GROUP = '_json';

/** @var \Illuminate\Contracts\Foundation\Application */
/**
* @var Application
*/
protected $app;
/** @var \Illuminate\Filesystem\Filesystem */

/**
* @var Filesystem
*/
protected $files;
/** @var \Illuminate\Contracts\Events\Dispatcher */

/**
* @var Dispatcher
*/
protected $events;

protected $config;
Expand Down Expand Up @@ -93,7 +102,7 @@ public function importTranslations($replace = false, $base = null, $import_group
$group = $subLangPath.'/'.$group;
}

if (! $vendor) {
if (!$vendor) {
$translations = \Lang::getLoader()->load($locale, $group);
} else {
$translations = include $file;
Expand Down Expand Up @@ -252,7 +261,9 @@ public function missingKey($namespace, $group, $key)

public function exportTranslations($group = null, $json = false)
{
$group = basename($group);
if (Arr::get($this->config, 'export.options.has-sub-folder', false)) {
$group = basename($group);
}
$basePath = $this->app['path.lang'];

if (! is_null($group) && ! $json) {
Expand Down Expand Up @@ -295,12 +306,18 @@ public function exportTranslations($group = null, $json = false)
}

if ($vendor) {
$path = $path.DIRECTORY_SEPARATOR.'messages.php';
$path .= DIRECTORY_SEPARATOR.'messages.php';
} else {
$path = $path.DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.$group.'.php';
$path .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.$group.'.php';
}

$output = "<?php\n\nreturn ".var_export($translations, true).';'.\PHP_EOL;
$output = "<?php\n\n";
if (Arr::get($this->config, 'export.options.use-old-format', false)) {
$output .= 'return '.var_export($translations, true).';'.\PHP_EOL;
} else {
$this->recurKSort($translations);
$output .= VarExporter::export($translations, VarExporter::ADD_RETURN);
}
$this->files->put($path, $output);
}
}
Expand Down Expand Up @@ -349,8 +366,11 @@ protected function makeTree($translations, $json = false)
foreach ($translations as $translation) {
// For JSON and sentences, do not use dotted notation
if ($json || Str::contains($translation->key, [' ']) || Str::endsWith($translation->key, ['.'])) {
$this->jsonSet($array[$translation->locale][$translation->group], $translation->key,
$translation->value);
$this->jsonSet(
$array[$translation->locale][$translation->group],
$translation->key,
$translation->value
);
} else {
Arr::set($array[$translation->locale][$translation->group], $translation->key,
$translation->value);
Expand Down Expand Up @@ -438,4 +458,14 @@ public function getConfig($key = null)
return $this->config[$key];
}
}

private function recurKSort(&$array): void
{
foreach ($array as &$value) {
if (is_array($value)) {
$this->recurKSort($value);
}
}
ksort($array);
}
}