Skip to content

Commit a0958b6

Browse files
Merge pull request #13 from AndreasEngelmark/development
Merge prior to deploy on 2022-06-01
2 parents a56dcbd + dab92a4 commit a0958b6

File tree

39 files changed

+289
-122
lines changed

39 files changed

+289
-122
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
label: Kommentar
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
label: Vedhæft
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
label: Svar
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
label: Vedhæft
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
label: 'Revisions dato'
1+
label: 'Revisionsdato'

config/sync/language/da/views.view.os2loop_search_db.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ display:
1111
filters:
1212
search_api_fulltext:
1313
expose:
14+
label: 'Søg'
1415
placeholder: 'Søg efter indhold eller emner'
1516
title: Søg
1617
header:

config/sync/system.site.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: OS2Loop
33
44
slogan: ''
55
page:
6-
front: /front-page
6+
front: /node/1
77
403: ''
88
404: ''
99
admin_compact_mode: false

config/sync/views.view.os2loop_search_db.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ display:
153153
exposed: true
154154
expose:
155155
operator_id: search_api_fulltext_op
156-
label: 'Fulltext search'
156+
label: 'Search'
157157
description: ''
158158
use_operator: false
159159
operator: search_api_fulltext_op

local_install_guide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
3. Type `git checkout development` to switch to development.
2020
3. Run `docker ps` to confirm everything is running.
2121
1. Note the port for `os2loop_ngingx_1`. This is where your site will spin up (ex. `0.0.0.0:53960` => `http://localhost:53960`).
22-
4. Run `docker exec -it os2loop_phpfpm_1 bash` to open terminal on `phpfpm`.
22+
4. Run `docker exec -it os2loop_phpfpm_1 bash` to open terminal on `phpfpm`. If this command doesn't work, check the name of your os2loop-phpfpm container. It might use dash \- instead of underscore \_
2323
1. Run `composer install`.
2424
2. Run `mkdir web/sites/default/files/`.
2525
3. Run `chmod 777 web/sites/default/files/` to allow access to folder (workaround for install issue).
@@ -45,7 +45,7 @@ Pre-commit hooks didn't work out of the box. For whatever reason, it didn't copy
4545

4646
### Install
4747
- [XAMPP](https://www.apachefriends.org/download.html)
48-
- [Composer](https://getcomposer.org/download/)
48+
- [Composer](https://getcomposer.org/download/)
4949

5050
for the pre-commit hook to work, install them in the written order. Remember to add PHP to your [windows environment path](https://dinocajic.medium.com/add-xampp-php-to-environment-variables-in-windows-10-af20a765b0ce).
5151

@@ -72,4 +72,4 @@ Make sure you don't have the latest version of `node` (v17). This causes issues
7272
7373
I also had issues with `prettier` not installing, despite it being in the `devDependencies`. I got around it by installing it globally (`npm install -g prettier`).
7474
75-
To access a normal login, append your localhost path with `/user/login#drupal-login`.
75+
To access a normal login, append your localhost path with `/user/login#drupal-login`.

web/profiles/custom/os2loop/modules/os2loop_post/src/Helper/Helper.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
use Drupal\Core\Form\FormStateInterface;
66
use Drupal\os2loop_post\Form\SettingsForm;
77
use Drupal\os2loop_settings\Settings;
8+
use Drupal\Core\StringTranslation\StringTranslationTrait;
89

910
/**
1011
* Helper for posts.
1112
*/
1213
class Helper {
14+
use StringTranslationTrait;
15+
1316
/**
1417
* The config.
1518
*
@@ -48,6 +51,7 @@ public function alterForm(array &$form, FormStateInterface $form_state, string $
4851
* The id of the the form.
4952
*/
5053
private function alterCommentForm(array &$form, FormStateInterface $form_state, string $form_id) {
54+
$form['actions']['submit']['#value'] = $this->t('Add');
5155
$form['actions']['preview']['#access'] = FALSE;
5256
$form['os2loop_post_comment']['widget']['#after_build'][] =
5357
[$this, 'fieldAfterBuild'];

0 commit comments

Comments
 (0)