Skip to content

Commit 258f0df

Browse files
hadomskyihadomskyi
committed
Fix translation link
ENG-17101
1 parent 7e3e6a0 commit 258f0df

File tree

6 files changed

+51
-40
lines changed

6 files changed

+51
-40
lines changed

‎.github/workflows/e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
"cypress/e2e/jobs/verified/success-path-single.cy.js",
3232
"cypress/e2e/jobs/instant/success-path-single.cy.js",
3333
]
34-
runs-on: ubuntu-latest
34+
runs-on: ubuntu-20.04
3535
steps:
3636
- uses: actions/checkout@v2
3737
- name: Set the value

‎e2e/Makefile

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ composer-install:
1616
composer require --ignore-platform-reqs "lilt/craft-lilt-plugin":"^999.9.9"
1717

1818
reset: cp composer-install
19-
docker-compose exec -T app sh -c 'php craft db/restore happylager.sql'
20-
docker-compose exec -T app sh -c 'php craft plugin/install craft-lilt-plugin'
19+
docker compose exec -T app sh -c 'php craft db/restore happylager.sql'
20+
docker compose exec -T app sh -c 'php craft plugin/install craft-lilt-plugin'
2121

2222

2323
install: clone
@@ -28,23 +28,23 @@ install: clone
2828
composer require craftcms/cms:3.7.68 -W
2929

3030
backup-db:
31-
docker-compose exec -T app sh -c 'php craft db/backup'
31+
docker compose exec -T app sh -c 'php craft db/backup'
3232

3333
refresh:
34-
docker-compose exec -T app sh -c 'rm -rf /app/vendor/lilt/craft-lilt-plugin'
35-
docker-compose exec -T app sh -c 'composer require --ignore-platform-reqs "lilt/craft-lilt-plugin":"^999.9.9"'
34+
docker compose exec -T app sh -c 'rm -rf /app/vendor/lilt/craft-lilt-plugin'
35+
docker compose exec -T app sh -c 'composer require --ignore-platform-reqs "lilt/craft-lilt-plugin":"^999.9.9"'
3636

3737
build:
3838
docker build -f happy-lager-main/Dockerfile happy-lager-main -t happy-lager
3939

4040
down:
41-
docker-compose down --remove-orphans -v
41+
docker compose down --remove-orphans -v
4242

4343
mup: #migrate app up
44-
docker-compose exec -T app sh -c 'php craft migrate/up'
44+
docker compose exec -T app sh -c 'php craft migrate/up'
4545

4646
mdown: #migrate app down
47-
docker-compose exec -T app sh -c 'php craft migrate/down'
47+
docker compose exec -T app sh -c 'php craft migrate/down'
4848

4949
cp:
5050
rm -rf happy-lager-main/plugin-src
@@ -84,32 +84,32 @@ wait-service:
8484
@echo "Service is up and running or max retries reached!"
8585

8686
up: clone down composer-install
87-
docker-compose up --build -d
88-
docker-compose ps
89-
docker-compose exec -T app sh -c 'chmod -R 777 /app'
90-
docker-compose exec -T app sh -c 'chown -R www-data:www-data /app'
91-
docker-compose exec -T mysql sh -c 'while ! mysqladmin ping -h"mysql" --silent; do sleep 1; done'
92-
docker-compose exec -T app sh -c 'php craft setup/security-key'
93-
docker-compose exec -T app sh -c 'echo DB_DRIVER=mysql >> .env'
94-
docker-compose exec -T app sh -c 'echo DB_SERVER=mysql >> .env'
95-
docker-compose exec -T app sh -c 'echo DB_DATABASE=${DB_DATABASE} >> .env'
96-
docker-compose exec -T app sh -c 'echo DB_USER=craft-lilt >> .env'
97-
docker-compose exec -T app sh -c 'echo DB_PASSWORD=craft-lilt >> .env'
98-
docker-compose exec -T app sh -c 'echo DB_SCHEMA=public >> .env'
99-
docker-compose exec -T app sh -c 'echo DB_TABLE_PREFIX= >> .env'
100-
docker-compose exec -T app sh -c 'echo CRAFT_LILT_PLUGIN_QUEUE_DELAY_IN_SECONDS=1 >> .env'
101-
docker-compose exec -T app sh -c 'echo CRAFT_LILT_PLUGIN_QUEUE_MANAGER_WAIT_TIME_IN_SECONDS=86400 >> .env'
102-
docker-compose exec -T app sh -c 'php craft db/restore happylager.sql'
103-
docker-compose exec -T app sh -c 'php craft plugin/install craft-lilt-plugin'
104-
docker-compose exec -T app sh -c 'php craft plugin/install neo'
105-
docker-compose exec -T app sh -c 'php craft plugin/install super-table'
106-
docker-compose exec -T app sh -c 'php craft project-config/rebuild'
107-
docker-compose exec -T app sh -c 'php craft up'
108-
docker-compose exec -T app sh -c 'php craft migrate/up'
109-
docker-compose exec -T app sh -c 'nohup ./queue_listen.sh > queue.log 2>&1 &'
110-
docker-compose exec -T app sh -c 'cat .env'
87+
docker compose up --build -d
88+
docker compose ps
89+
docker compose exec -T app sh -c 'chmod -R 777 /app'
90+
docker compose exec -T app sh -c 'chown -R www-data:www-data /app'
91+
docker compose exec -T mysql sh -c 'while ! mysqladmin ping -h"mysql" --silent; do sleep 1; done'
92+
docker compose exec -T app sh -c 'php craft setup/security-key'
93+
docker compose exec -T app sh -c 'echo DB_DRIVER=mysql >> .env'
94+
docker compose exec -T app sh -c 'echo DB_SERVER=mysql >> .env'
95+
docker compose exec -T app sh -c 'echo DB_DATABASE=${DB_DATABASE} >> .env'
96+
docker compose exec -T app sh -c 'echo DB_USER=craft-lilt >> .env'
97+
docker compose exec -T app sh -c 'echo DB_PASSWORD=craft-lilt >> .env'
98+
docker compose exec -T app sh -c 'echo DB_SCHEMA=public >> .env'
99+
docker compose exec -T app sh -c 'echo DB_TABLE_PREFIX= >> .env'
100+
docker compose exec -T app sh -c 'echo CRAFT_LILT_PLUGIN_QUEUE_DELAY_IN_SECONDS=1 >> .env'
101+
docker compose exec -T app sh -c 'echo CRAFT_LILT_PLUGIN_QUEUE_MANAGER_WAIT_TIME_IN_SECONDS=86400 >> .env'
102+
docker compose exec -T app sh -c 'php craft db/restore happylager.sql'
103+
docker compose exec -T app sh -c 'php craft plugin/install craft-lilt-plugin'
104+
docker compose exec -T app sh -c 'php craft plugin/install neo'
105+
docker compose exec -T app sh -c 'php craft plugin/install super-table'
106+
docker compose exec -T app sh -c 'php craft project-config/rebuild'
107+
docker compose exec -T app sh -c 'php craft up'
108+
docker compose exec -T app sh -c 'php craft migrate/up'
109+
docker compose exec -T app sh -c 'nohup ./queue_listen.sh > queue.log 2>&1 &'
110+
docker compose exec -T app sh -c 'cat .env'
111111
cli:
112-
docker-compose exec app sh
112+
docker compose exec app sh
113113

114114
test:
115115
docker run -u root -t -v ${PWD}:/e2e -w /e2e --env CYPRESS_CACHE_FOLDER=${CYPRESS_CACHE_FOLDER} node:18.12.1 npm install

‎src/elements/Translation.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use lilthq\craftliltplugin\elements\actions\JobEdit;
2020
use lilthq\craftliltplugin\elements\db\TranslationQuery;
2121
use lilthq\craftliltplugin\models\TranslationModelTrait;
22+
use craft\elements\User;
2223
use lilthq\craftliltplugin\records\TranslationNotificationsRecord;
2324
use lilthq\craftliltplugin\records\TranslationRecord;
2425

@@ -128,6 +129,16 @@ public function getIsReviewed(): bool
128129
return $this->getIsPublished() || $this->status === TranslationRecord::STATUS_READY_TO_PUBLISH;
129130
}
130131

132+
public function getUrl(): ?string
133+
{
134+
return $this->getCpEditUrl();
135+
}
136+
137+
public function canView(User $user): bool
138+
{
139+
return true;
140+
}
141+
131142
public function getStatusHtml(): string
132143
{
133144
$label = self::statuses()[$this->status]['label'] ?? self::statuses()[$this->status];

‎tests/integration/controllers/job/GetJobCreateFormControllerCest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,11 @@ private function getExpected(): array
266266
'crumbs' => [
267267
0 => [
268268
'label' => 'Lilt Plugin',
269-
'url' => 'http://$PRIMARY_SITE_URL/index.php?p=admin/admin/craft-lilt-plugin&site=default',
269+
'url' => 'http://test.craftcms.test:80/index.php?p=admin/admin/craft-lilt-plugin&site=default',
270270
],
271271
1 => [
272272
'label' => 'Jobs',
273-
'url' => 'http://$PRIMARY_SITE_URL/index.php?p=admin/admin/craft-lilt-plugin/jobs&site=default',
273+
'url' => 'http://test.craftcms.test:80/index.php?p=admin/admin/craft-lilt-plugin/jobs&site=default',
274274
],
275275
],
276276
],

‎tests/integration/controllers/job/GetJobEditFormControllerCest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,11 +331,11 @@ private function getExpected(Job $job): array
331331
'crumbs' => [
332332
0 => [
333333
'label' => 'Lilt Plugin',
334-
'url' => 'http://$PRIMARY_SITE_URL/index.php?p=admin/admin/craft-lilt-plugin&site=default',
334+
'url' => 'http://test.craftcms.test:80/index.php?p=admin/admin/craft-lilt-plugin&site=default',
335335
],
336336
1 => [
337337
'label' => 'Jobs',
338-
'url' => 'http://$PRIMARY_SITE_URL/index.php?p=admin/admin/craft-lilt-plugin/jobs&site=default',
338+
'url' => 'http://test.craftcms.test:80/index.php?p=admin/admin/craft-lilt-plugin/jobs&site=default',
339339
],
340340
],
341341
],

‎tests/integration/controllers/job/GetTranslationReviewControllerCest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function testSuccess(IntegrationTester $I): void
119119

120120
if (method_exists(Assert::class, 'assertMatchesRegularExpression')) {
121121
Assert::assertMatchesRegularExpression(
122-
"/^http:\/\/\\\$PRIMARY_SITE_URL\/index\.php\?p=blog\/first-entry-user-1&token=[0-9a-zA-Z\S]+$/",
122+
"/^http:\/\/test\.craftcms\.test:80\/index\.php\?p=blog\/first-entry-user-1&token=[0-9a-zA-Z\S]+$/",
123123
$actual['variables']['originalUrl']
124124
);
125125
Assert::assertMatchesRegularExpression(
@@ -128,7 +128,7 @@ public function testSuccess(IntegrationTester $I): void
128128
);
129129
} else {
130130
Assert::assertRegExp(
131-
"/^http:\/\/\\\$PRIMARY_SITE_URL\/index\.php\?p=blog\/first-entry-user-1&token=[0-9a-zA-Z\S]+$/",
131+
"/^http:\/\/test\.craftcms\.test:80\/index\.php\?p=blog\/first-entry-user-1&token=[0-9a-zA-Z\S]+$/",
132132
$actual['variables']['originalUrl']
133133
);
134134
Assert::assertRegExp(

0 commit comments

Comments
 (0)