Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeymezenin committed Nov 21, 2017
1 parent d8d2cbd commit 240ffed
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ How | Good | Bad
------------ | ------------- | -------------
Controller: singular | ArticleController | ~~ArticlesController~~
Route: plural | articles/1 | ~~article/1~~
Named route | users.show_active | ~~ users.show-active, show-active-users~~
Named route | users.show_active | ~~users.show-active, show-active-users~~
Model: singular | User | ~~Users~~
hasOne or belongsTo relationship: singular | articleComment | ~~articleComments, article_comment~~
All other relationships: plural | articleComments | ~~articleComment, article_comments~~
Expand All @@ -460,6 +460,7 @@ Collection: descriptive, plural | $activeUsers = User::active()->get() | ~~$acti
Object: descriptive, singular | $activeUser = User::active()->first() | ~~$users, $obj~~
Config and language files index | articles_enabled | ~~ArticlesEnabled; articles-enabled~~
View | show_filtered.blade.php | ~~showFiltered.blade.php; show-filtered.blade.php~~
Config | google_calendar.php | ~~googleCalendar.php; google-calendar.php~~
Contract (interface): adjective or noun | Authenticatable | ~~AuthenticationInterface, IAuthentication~~
Trait: adjective | Notifiable | ~~NotificationTrait~~

Expand Down
5 changes: 3 additions & 2 deletions russian.md
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ e2e тестирование | Laravel Dusk | Codeception
------------ | ------------- | -------------
Контроллер: ед. ч. | ArticleController | ~~ArticlesController~~
Маршруты: мн. ч. | articles/1 | ~~article/1~~
Имена маршрутов | users.show_active | ~~ users.show-active, show-active-users~~
Имена маршрутов | users.show_active | ~~users.show-active, show-active-users~~
Модель: ед. ч. | User | ~~Users~~
Отношения hasOne и belongsTo: ед. ч. | articleComment | ~~articleComments, article_comment~~
Все остальные отношения: мн. ч. | articleComments | ~~articleComment, article_comments~~
Expand All @@ -455,7 +455,8 @@ Pivot таблица: имена моделей в алфавитном поря
Коллекция: описательное, мн. ч. | $activeUsers = User::active()->get() | ~~$active, $data~~
Объект: описательное, ед. ч. | $activeUser = User::active()->first() | ~~$users, $obj~~
Индексы в конфиге и языковых файлах | articles_enabled | ~~ArticlesEnabled; articles-enabled~~
Представления | show_filtered.blade.php | ~~showFiltered.blade.php; show-filtered.blade.php~~
Представление | show_filtered.blade.php | ~~showFiltered.blade.php; show-filtered.blade.php~~
Конфигурационный файл | google_calendar.php | ~~googleCalendar.php; google-calendar.php~~
Контракт (интерфейс): прилагательное или существительное | Authenticatable | ~~AuthenticationInterface, IAuthentication~~
Трейт: прилагательное | Notifiable | ~~NotificationTrait~~

Expand Down

0 comments on commit 240ffed

Please sign in to comment.