Skip to content

Commit

Permalink
Minot fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@autowp
autowp committed Mar 15, 2017
1 parent 35ccc25 commit 51c4631
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 113 deletions.
6 changes: 4 additions & 2 deletions module/Application/language/de.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1179,6 +1179,9 @@
'moder/vehicle/is-concept/inherited-no' => 'inherited (no)',
'moder/vehicle/is-concept/inherited-yes' => 'inherited (yes)',
'moder/vehicle/is-concept/inherited' => 'inherited',

'moder/item/short-description' => 'Short description',
'moder/item/full-description' => 'Full description',

'moder/vehicle/tabs/meta' => 'Meta',
'moder/vehicle/tabs/name' => 'Name & description',
Expand Down Expand Up @@ -1537,9 +1540,8 @@
'specifications-editor/admin/move' => 'Move',

'pm/user-%s-edited-brand-description-%s-%s' => 'User %s edited brand description %s ( %s )',
'pm/user-%s-edited-vehicle-full-description-%s-%s' => 'User %s edited vehicle full description %s ( %s )',
'pm/user-%s-edited-item-language-%s-%s' => "User %s edited language data %s ( %s )\n%s",
'pm/user-%s-edited-vehicle-meta-data-%s-%s-%s' => "User %s edited vehicle meta-data %s ( %s )\n%s",
'pm/user-%s-edited-vehicle-description-%s-%s' => 'User %s edited vehicle description %s ( %s )',
'pm/user-%s-adds-item-%s-%s-to-item-%s-%s' => 'User %s added %s ( %s ) to %s ( %s )',
'pm/user-%s-removed-item-%s-%s-from-item-%s-%s' => 'User %s removed %s ( %s ) from %s ( %s )',
'pm/user-%s-cancel-link-vehicle-%s-%s-with-categories-%s' => 'User %s cancel link vehicle %s ( %s ) with categories: %s',
Expand Down
10 changes: 6 additions & 4 deletions module/Application/language/en.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,9 @@
'moder/vehicle/is-concept/inherited-no' => 'inherited (no)',
'moder/vehicle/is-concept/inherited-yes' => 'inherited (yes)',
'moder/vehicle/is-concept/inherited' => 'inherited',

'moder/item/short-description' => 'Short description',
'moder/item/full-description' => 'Full description',

'moder/vehicle/tabs/meta' => 'Meta',
'moder/vehicle/tabs/name' => 'Name & description',
Expand Down Expand Up @@ -1539,12 +1542,11 @@
'specifications-editor/admin/move' => 'Move',

'pm/user-%s-edited-brand-description-%s-%s' => 'User %s edited brand description %s ( %s )',
'pm/user-%s-edited-vehicle-full-description-%s-%s' => 'User %s edited vehicle full description %s ( %s )',
'pm/user-%s-edited-vehicle-meta-data-%s-%s-%s' => "User %s edited vehicle meta-data %s ( %s )\n%s",
'pm/user-%s-edited-vehicle-description-%s-%s' => 'User %s edited vehicle description %s ( %s )',
'pm/user-%s-edited-item-language-%s-%s' => "User %s edited language data %s ( %s )\n%s",
'pm/user-%s-edited-vehicle-meta-data-%s-%s-%s' => "User %s edited item meta-data %s ( %s )\n%s",
'pm/user-%s-adds-item-%s-%s-to-item-%s-%s' => 'User %s added %s ( %s ) to %s ( %s )',
'pm/user-%s-removed-item-%s-%s-from-item-%s-%s' => 'User %s removed %s ( %s ) from %s ( %s )',
'pm/user-%s-cancel-link-vehicle-%s-%s-with-categories-%s' => 'User %s cancel link vehicle %s ( %s ) with categories: %s',
'pm/user-%s-cancel-link-vehicle-%s-%s-with-categories-%s' => 'User %s cancel link item %s ( %s ) with categories: %s',
'pm/user-%s-edited-factory-description-%s-%s' => 'User %s edited factory description %s ( %s )',
'pm/your-picture-%s-enqueued-to-remove-%s' => "Your picture %s enqueued to remove\n%s",
'pm/new-picture-%s-vote-%s/accept' => "New picture accept vote\n%s\nReason: %s",
Expand Down
6 changes: 4 additions & 2 deletions module/Application/language/fr.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1178,6 +1178,9 @@
'moder/vehicle/is-concept/inherited-no' => 'inherited (no)',
'moder/vehicle/is-concept/inherited-yes' => 'inherited (yes)',
'moder/vehicle/is-concept/inherited' => 'inherited',

'moder/item/short-description' => 'Short description',
'moder/item/full-description' => 'Full description',

'moder/vehicle/tabs/meta' => 'Meta',
'moder/vehicle/tabs/name' => 'Name & description',
Expand Down Expand Up @@ -1535,9 +1538,8 @@
'specifications-editor/admin/move' => 'Déplacer',

'pm/user-%s-edited-brand-description-%s-%s' => 'User %s edited brand description %s ( %s )',
'pm/user-%s-edited-vehicle-full-description-%s-%s' => 'User %s edited vehicle full description %s ( %s )',
'pm/user-%s-edited-item-language-%s-%s' => "User %s edited language data %s ( %s )\n%s",
'pm/user-%s-edited-vehicle-meta-data-%s-%s-%s' => "User %s edited vehicle meta-data %s ( %s )\n%s",
'pm/user-%s-edited-vehicle-description-%s-%s' => 'User %s edited vehicle description %s ( %s )',
'pm/user-%s-adds-item-%s-%s-to-item-%s-%s' => 'User %s added %s ( %s ) to %s ( %s )',
'pm/user-%s-removed-item-%s-%s-from-item-%s-%s' => 'User %s removed %s ( %s ) from %s ( %s )',
'pm/user-%s-cancel-link-vehicle-%s-%s-with-categories-%s' => 'User %s cancel link vehicle %s ( %s ) with categories: %s',
Expand Down
6 changes: 4 additions & 2 deletions module/Application/language/ru.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1188,6 +1188,9 @@
'moder/vehicle/is-concept/inherited-no' => 'унаследовано (нет)',
'moder/vehicle/is-concept/inherited-yes' => 'унаследовано (да)',
'moder/vehicle/is-concept/inherited' => 'унаследовано',

'moder/item/short-description' => 'Краткое описание',
'moder/item/full-description' => 'Полное описание',

'moder/vehicle/tabs/meta' => 'Мета',
'moder/vehicle/tabs/name' => 'Название и описание',
Expand Down Expand Up @@ -1548,9 +1551,8 @@
'specifications-editor/admin/move' => 'Перенести',

'pm/user-%s-edited-brand-description-%s-%s' => 'Пользователь %s редактировал описание бренда %s ( %s )',
'pm/user-%s-edited-vehicle-full-description-%s-%s' => 'Пользователь %s редактировал полное описание автомобиля %s ( %s )',
'pm/user-%s-edited-item-language-%s-%s' => "Пользователь %s редактировал языковую информацию %s ( %s )\n%s",
'pm/user-%s-edited-vehicle-meta-data-%s-%s-%s' => "Пользователь %s редактировал информацию об автомобиле %s ( %s )\n%s",
'pm/user-%s-edited-vehicle-description-%s-%s' => 'Пользователь %s редактировал описание автомобиля %s ( %s )',
'pm/user-%s-adds-item-%s-%s-to-item-%s-%s' => 'Пользователь %s добавил %s ( %s ) в %s ( %s )',
'pm/user-%s-removed-item-%s-%s-from-item-%s-%s' => 'Пользователь %s удалил %s ( %s ) из %s ( %s )',
'pm/user-%s-cancel-link-vehicle-%s-%s-with-categories-%s' => 'Пользователь %s отменил вашу привязку автомобиля %s ( %s ) к категориям: %s',
Expand Down
6 changes: 4 additions & 2 deletions module/Application/language/zh.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1151,6 +1151,9 @@
'moder/vehicle/is-concept/inherited-no' => '无继承性',
'moder/vehicle/is-concept/inherited-yes' => '有继承性',
'moder/vehicle/is-concept/inherited' => '已有继承性',

'moder/item/short-description' => 'Short description',
'moder/item/full-description' => 'Full description',

'moder/vehicle/tabs/meta' => 'Meta',
'moder/vehicle/tabs/name' => '车名&描述',
Expand Down Expand Up @@ -1509,9 +1512,8 @@
'specifications-editor/admin/move' => '移动',

'pm/user-%s-edited-brand-description-%s-%s' => '用户%s编辑了品牌介绍%s ( %s )',
'pm/user-%s-edited-vehicle-full-description-%s-%s' => '用户%s编辑了车型的完整介绍%s ( %s )',
'pm/user-%s-edited-item-language-%s-%s' => "User %s edited language data %s ( %s )\n%s",
'pm/user-%s-edited-vehicle-meta-data-%s-%s-%s' => "用户%s编辑了车型基本数据%s ( %s )\n%s",
'pm/user-%s-edited-vehicle-description-%s-%s' => '用户%s编辑了车型介绍%s ( %s )',
'pm/user-%s-adds-item-%s-%s-to-item-%s-%s' => 'User %s added %s ( %s ) to %s ( %s )',
'pm/user-%s-removed-item-%s-%s-from-item-%s-%s' => 'User %s removed %s ( %s ) from %s ( %s )',
'pm/user-%s-cancel-link-vehicle-%s-%s-with-categories-%s' => '用户%s为车型%s ( %s )取消了到目录: %s的关联',
Expand Down
132 changes: 34 additions & 98 deletions module/Application/src/Application/Controller/Moder/CarsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1970,10 +1970,9 @@ public function carNameAction()
'item_id' => $car->id,
'language' => $lang
]);
$nameChanged = true;
} else {
$nameChanged = ($name != $langRow->name);
}

$nameChanged = ($name != $langRow->name);

$langRow->setFromArray([
'name' => $name,
Expand Down Expand Up @@ -2010,119 +2009,56 @@ public function carNameAction()
}

if ($nameChanged) {
$changes[$lang][] = 'name';
$changes[$lang][] = 'moder/vehicle/name';
}

if ($textChanged) {
$changes[$lang][] = 'text';
$changes[$lang][] = 'moder/item/short-description';
}

if ($fullTextChanged) {
$changes[$lang][] = 'full_text';
$changes[$lang][] = 'moder/item/full-description';
}
}

$this->brandVehicle->refreshAutoByVehicle($car->id);

/*if ($changes) {
$userIds = $this->textStorage->getTextUserIds($car->full_text_id);
$userTable = new \Autowp\User\Model\DbTable\User();
foreach ($userIds as $userId) {
if ($userId != $user->id) {
foreach ($userTable->find($userId) as $userRow) {
$uri = $this->hostManager->getUriByLanguage($userRow->language);
$message = sprintf(
$this->translate(
'pm/user-%s-edited-vehicle-full-description-%s-%s',
if ($changes) {
$ucsTable = new DbTable\User\ItemSubscribe();
$ucsTable->subscribe($user, $car);

foreach ($ucsTable->getItemSubscribers($car) as $subscriber) {
if ($subscriber && ($subscriber->id != $user->id)) {
$uri = $this->hostManager->getUriByLanguage($subscriber->language);

$changesStr = [];
foreach ($changes as $language => $fields) {
foreach ($fields as $field) {
$changesStr[] = $this->translate(
$field,
'default',
$userRow->language
),
$this->userModerUrl($user, true, $uri),
$this->car()->formatName($car, $userRow->language),
$this->carModerUrl($car, true, null, $uri)
);
$this->message->send(null, $userRow->id, $message);
}
}
}
}*/
/*
if ($car->text_id) {
$userIds = $this->textStorage->getTextUserIds($car->text_id);
$userTable = new \Autowp\User\Model\DbTable\User();
foreach ($userIds as $userId) {
if ($userId != $user->id) {
foreach ($userTable->find($userId) as $userRow) {
$uri = $this->hostManager->getUriByLanguage($userRow->language);
$message = sprintf(
$this->translate(
'pm/user-%s-edited-vehicle-description-%s-%s',
'default',
$userRow->language
),
$this->userModerUrl($user, true, $uri),
$this->car()->formatName($car, $userRow->language),
$this->carModerUrl($car, true, null, $uri)
);
$this->message->send(null, $userRow->id, $message);
$subscriber->language
) . ' (' . $language . ')';
}
}
}
}
$changes = [];
foreach ($this->allowedLanguages as $lang) {
$value = trim($this->params()->fromPost($lang));
$row = $carLangTable->fetchRow([
'item_id = ?' => $car->id,
'language = ?' => $lang
]);
if ($value) {
if (! $row) {
$row = $carLangTable->createRow([
'item_id' => $car->id,
'language' => $lang
]);
}
if ($row->name != $value) {
$changes[] = 'Установлено ' . strtoupper($lang) . ': ' . $value;
}
$row->name = $value;
$row->save();
} else {
if ($row) {
$changes[] = 'Удалено ' . strtoupper($lang) . ': ' . $row->name;
$row->delete();

$message = sprintf(
$this->translate(
'pm/user-%s-edited-item-language-%s-%s',
'default',
$subscriber->language
),
$this->userModerUrl($user, true, $uri),
$this->car()->formatName($car, $subscriber->language),
$this->carModerUrl($car, true, null, $uri),
implode("\n", $changesStr)
);

$this->message->send(null, $subscriber->id, $message);
}
}
}

if ($changes) {
foreach ($changes as &$change) {
$change = htmlspecialchars($change);
}
unset($change); // prevent future bugs
$message = sprintf(
'Редактирование названий автомобиля %s',
htmlspecialchars($this->car()->formatName($car, 'en')).
( count($changes) ? '<p>'.implode('<br />', $changes).'</p>' : '')
);
$this->log($message, $car);
}
*/

$this->log(sprintf(
'Редактирование языковых названия, описания и полного описания автомобиля %s',
htmlspecialchars($this->car()->formatName($car, 'en'))
Expand Down
6 changes: 3 additions & 3 deletions module/Application/src/Application/Form/Moder/ItemLanguage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public function __construct()
'name' => 'name',
'type' => 'Text',
'options' => [
'label' => 'Name',
'label' => 'moder/vehicle/name',
],
'attributes' => [
'maxlength' => 255,
Expand All @@ -28,7 +28,7 @@ public function __construct()
'name' => 'text',
'type' => 'Textarea',
'options' => [
'label' => 'Short description',
'label' => 'moder/item/short-description',
],
'attributes' => [
'maxlength' => 65536,
Expand All @@ -39,7 +39,7 @@ public function __construct()
'name' => 'full_text',
'type' => 'Textarea',
'options' => [
'label' => 'Full description',
'label' => 'moder/item/full-description',
],
'attributes' => [
'maxlength' => 65536,
Expand Down

0 comments on commit 51c4631

Please sign in to comment.