@@ -7,75 +7,75 @@ discard block |
||
7 | 7 | |
8 | 8 | trait Translatable |
9 | 9 | { |
10 | - public static $transtableFieldName = 'translatable'; |
|
10 | + public static $transtableFieldName = 'translatable'; |
|
11 | 11 | |
12 | - public $translatable; |
|
13 | - public $model; |
|
12 | + public $translatable; |
|
13 | + public $model; |
|
14 | 14 | |
15 | - protected $locale; |
|
15 | + protected $locale; |
|
16 | 16 | |
17 | - public static function bootTranslatable() |
|
18 | - { |
|
19 | - static::addGlobalScope(new TranslatableScope); |
|
17 | + public static function bootTranslatable() |
|
18 | + { |
|
19 | + static::addGlobalScope(new TranslatableScope); |
|
20 | 20 | |
21 | - static::saving(function ($model) { |
|
22 | - $model->translatable = collect($model->attributes)->only(static::$transtableFieldName)->toArray(); |
|
23 | - $model->attributes = collect($model->attributes)->except(static::$transtableFieldName)->toArray(); |
|
24 | - }); |
|
21 | + static::saving(function ($model) { |
|
22 | + $model->translatable = collect($model->attributes)->only(static::$transtableFieldName)->toArray(); |
|
23 | + $model->attributes = collect($model->attributes)->except(static::$transtableFieldName)->toArray(); |
|
24 | + }); |
|
25 | 25 | |
26 | - static::saved(function ($model) { |
|
27 | - if ($model->translatable) { |
|
28 | - (new self)->saveTranslation($model); |
|
29 | - } |
|
30 | - }); |
|
26 | + static::saved(function ($model) { |
|
27 | + if ($model->translatable) { |
|
28 | + (new self)->saveTranslation($model); |
|
29 | + } |
|
30 | + }); |
|
31 | 31 | |
32 | - static::deleted(function ($model) { |
|
33 | - if ((new $model)->has('translations')) { |
|
34 | - $model->translations()->delete(); |
|
35 | - } |
|
36 | - }); |
|
37 | - } |
|
32 | + static::deleted(function ($model) { |
|
33 | + if ((new $model)->has('translations')) { |
|
34 | + $model->translations()->delete(); |
|
35 | + } |
|
36 | + }); |
|
37 | + } |
|
38 | 38 | |
39 | - public function locale($value = null) |
|
40 | - { |
|
41 | - $this->locale = $value; |
|
39 | + public function locale($value = null) |
|
40 | + { |
|
41 | + $this->locale = $value; |
|
42 | 42 | |
43 | - return $this; |
|
44 | - } |
|
43 | + return $this; |
|
44 | + } |
|
45 | 45 | |
46 | - // Relationship |
|
47 | - public function translations() |
|
48 | - { |
|
49 | - return $this->morphMany(Translation::class, 'translatable'); |
|
50 | - } |
|
46 | + // Relationship |
|
47 | + public function translations() |
|
48 | + { |
|
49 | + return $this->morphMany(Translation::class, 'translatable'); |
|
50 | + } |
|
51 | 51 | |
52 | - // scope |
|
53 | - public function scopeTranslated($query, ...$fields) |
|
54 | - { |
|
55 | - $this->locale = $this->locale ?? app()->getLocale(); |
|
52 | + // scope |
|
53 | + public function scopeTranslated($query, ...$fields) |
|
54 | + { |
|
55 | + $this->locale = $this->locale ?? app()->getLocale(); |
|
56 | 56 | |
57 | - $fields = empty($fields) ? $this->getTranslatedFieldsForCurrentModel() : collect($fields); |
|
57 | + $fields = empty($fields) ? $this->getTranslatedFieldsForCurrentModel() : collect($fields); |
|
58 | 58 | |
59 | - if ($fields->isEmpty()) { |
|
60 | - return $query; |
|
61 | - } |
|
59 | + if ($fields->isEmpty()) { |
|
60 | + return $query; |
|
61 | + } |
|
62 | 62 | |
63 | - // Add select * if nothing has been selected yet |
|
64 | - if ($query->getQuery()->columns === null) { |
|
65 | - $query->select('*'); |
|
66 | - } |
|
63 | + // Add select * if nothing has been selected yet |
|
64 | + if ($query->getQuery()->columns === null) { |
|
65 | + $query->select('*'); |
|
66 | + } |
|
67 | 67 | |
68 | - // Build the sub select |
|
69 | - $fields->each(function ($key) use ($query) { |
|
70 | - $this->subSelectTranslation($query, $key); |
|
71 | - }); |
|
68 | + // Build the sub select |
|
69 | + $fields->each(function ($key) use ($query) { |
|
70 | + $this->subSelectTranslation($query, $key); |
|
71 | + }); |
|
72 | 72 | |
73 | - return $query; |
|
74 | - } |
|
73 | + return $query; |
|
74 | + } |
|
75 | 75 | |
76 | - protected function subSelectTranslation($query, $key): void |
|
77 | - { |
|
78 | - $query->addSelect(\DB::raw('( |
|
76 | + protected function subSelectTranslation($query, $key): void |
|
77 | + { |
|
78 | + $query->addSelect(\DB::raw('( |
|
79 | 79 | SELECT `' . Translation::getTableName() . '`.`value` |
80 | 80 | FROM `' . Translation::getTableName() . '` |
81 | 81 | WHERE `' . Translation::getTableName() . '`.`translatable_type` = "' . \get_class($this) . '" |
@@ -83,30 +83,30 @@ discard block |
||
83 | 83 | AND `' . Translation::getTableName() . '`.`key` = "' . $key . '" |
84 | 84 | AND `' . Translation::getTableName() . '`.`translatable_id` = `' . $this->getTable() . '`.`' . $this->primaryKey . '` |
85 | 85 | ) as `' . $key . '`') |
86 | - ); |
|
87 | - } |
|
86 | + ); |
|
87 | + } |
|
88 | 88 | |
89 | - /** |
|
90 | - * Query the translations table for possible keys if none are provided. |
|
91 | - * @return Collection |
|
92 | - */ |
|
93 | - public function getTranslatedFieldsForCurrentModel(): Collection |
|
94 | - { |
|
95 | - $table = Translation::getTableName(); |
|
89 | + /** |
|
90 | + * Query the translations table for possible keys if none are provided. |
|
91 | + * @return Collection |
|
92 | + */ |
|
93 | + public function getTranslatedFieldsForCurrentModel(): Collection |
|
94 | + { |
|
95 | + $table = Translation::getTableName(); |
|
96 | 96 | |
97 | - return DB::table($table)->select($table . '.key') |
|
98 | - ->where($table . '.translatable_type', \get_class($this)) |
|
99 | - ->where($table . '.locale', $this->locale) |
|
100 | - ->groupBy($table . '.key') |
|
101 | - ->pluck('key'); |
|
102 | - } |
|
97 | + return DB::table($table)->select($table . '.key') |
|
98 | + ->where($table . '.translatable_type', \get_class($this)) |
|
99 | + ->where($table . '.locale', $this->locale) |
|
100 | + ->groupBy($table . '.key') |
|
101 | + ->pluck('key'); |
|
102 | + } |
|
103 | 103 | |
104 | - public function saveTranslation($model): int |
|
105 | - { |
|
106 | - return (new Translation)->store([ |
|
107 | - 'translatable' => $model->translatable[static::$transtableFieldName], |
|
108 | - 'translatable_type' => \get_class($model), |
|
109 | - 'translatable_id' => $model->id, |
|
110 | - ]); |
|
111 | - } |
|
104 | + public function saveTranslation($model): int |
|
105 | + { |
|
106 | + return (new Translation)->store([ |
|
107 | + 'translatable' => $model->translatable[static::$transtableFieldName], |
|
108 | + 'translatable_type' => \get_class($model), |
|
109 | + 'translatable_id' => $model->id, |
|
110 | + ]); |
|
111 | + } |
|
112 | 112 | } |
@@ -35,25 +35,25 @@ |
||
35 | 35 | { |
36 | 36 | } |
37 | 37 | ======= |
38 | - public function boot() |
|
39 | - { |
|
40 | - $this->loadMigrationsFrom(__DIR__ . '/database/migrations/'); |
|
38 | + public function boot() |
|
39 | + { |
|
40 | + $this->loadMigrationsFrom(__DIR__ . '/database/migrations/'); |
|
41 | 41 | |
42 | - $this->publishes([ |
|
43 | - __DIR__ . '/database/migrations/' => database_path('migrations') |
|
44 | - ], 'migrations'); |
|
42 | + $this->publishes([ |
|
43 | + __DIR__ . '/database/migrations/' => database_path('migrations') |
|
44 | + ], 'migrations'); |
|
45 | 45 | |
46 | - $this->publishes([ |
|
47 | - __DIR__ . '/config/languages.php' => config_path('languages.php'), |
|
48 | - ], 'config'); |
|
46 | + $this->publishes([ |
|
47 | + __DIR__ . '/config/languages.php' => config_path('languages.php'), |
|
48 | + ], 'config'); |
|
49 | 49 | |
50 | - Collection::macro('for', function ($field, $code) { |
|
51 | - return $this->where('key', $field)->where('locale', $code)->pluck('value')->first() ?? $field; |
|
52 | - }); |
|
53 | - } |
|
50 | + Collection::macro('for', function ($field, $code) { |
|
51 | + return $this->where('key', $field)->where('locale', $code)->pluck('value')->first() ?? $field; |
|
52 | + }); |
|
53 | + } |
|
54 | 54 | |
55 | - public function register() |
|
56 | - { |
|
57 | - } |
|
55 | + public function register() |
|
56 | + { |
|
57 | + } |
|
58 | 58 | >>>>>>> Stashed changes |
59 | 59 | } |