summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamian Dlugosz <bigfootdd@gmail.com>2017-02-02 00:25:30 +0100
committerDamian Dlugosz <bigfootdd@gmail.com>2017-02-02 00:32:30 +0100
commitff12d2eda90918ffcf1600a3e29572096816be32 (patch)
tree09a49b2e793bd4a5f9d31e1a54565e6083fdceb1
parent59f39f933d91a60f292127290094e346fb5aa8f3 (diff)
downloadsql-parser-ff12d2eda90918ffcf1600a3e29572096816be32.zip
sql-parser-ff12d2eda90918ffcf1600a3e29572096816be32.tar.gz
sql-parser-ff12d2eda90918ffcf1600a3e29572096816be32.tar.bz2
Made motranslator vendor optional
-rw-r--r--README.md24
-rw-r--r--composer.json7
-rw-r--r--src/Translator.php4
3 files changed, 34 insertions, 1 deletions
diff --git a/README.md b/README.md
index 0ac21d7..4a04299 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,30 @@ $query2 = $statement->build();
var_dump($query2); // outputs string(19) "SELECT * FROM "b" "
```
+## Localization
+
+You can localize error messages installing `phpmyadmin/motranslator` version `3.0` or newer:
+```sh
+composer require phpmyadmin/motranslator:^3.0
+```
+
+The locale is automatically detected from your enrivonment, you can also set a different locale
+
+**From cli**:
+```sh
+LC_ALL=pl ./vendor/bin/lint-query --query "SELECT 1"
+```
+
+**From php**:
+```php
+require __DIR__."/vendor/autoload.php";
+
+$GLOBALS['lang'] = 'pl';
+
+$query1 = "select * from a";
+$parser = new PhpMyAdmin\SqlParser\Parser($query1);
+```
+
## More information
This library was originally created during the Google Summer of Code 2015 and has been used by phpMyAdmin since version 4.5.
diff --git a/composer.json b/composer.json
index 6bf3df2..eead1fd 100644
--- a/composer.json
+++ b/composer.json
@@ -17,9 +17,14 @@
},
"require": {
"php": ">=5.3.0",
- "phpmyadmin/motranslator": "~3.0",
"ext-mbstring": "*"
},
+ "conflict": {
+ "phpmyadmin/motranslator": "<3.0"
+ },
+ "suggest": {
+ "phpmyadmin/motranslator": "Translate messages to your favorite locale"
+ },
"require-dev": {
"phpunit/php-code-coverage": "~2.0 || ~3.0",
"phpunit/phpunit": "~4.8 || ~5.1"
diff --git a/src/Translator.php b/src/Translator.php
index 9b740c2..bb5df34 100644
--- a/src/Translator.php
+++ b/src/Translator.php
@@ -58,6 +58,10 @@ class Translator
*/
public static function gettext($msgid)
{
+ if (!class_exists('\PhpMyAdmin\MoTranslator\Loader', true)) {
+ return $msgid;
+ }
+
self::load();
return self::$translator->gettext($msgid);