Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

German language editing #1552

Merged
merged 16 commits into from
Dec 5, 2022
Merged

German language editing #1552

merged 16 commits into from
Dec 5, 2022

Conversation

SvenSt-BIE
Copy link
Contributor

No description provided.

dependabot bot and others added 9 commits September 22, 2022 20:42
@dependabot
Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-admin (comp…
0d1242f 
…democracy#1523)

Bumps node from 11.15.0-alpine to 18.9.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-report (com…
54ed279 
…pdemocracy#1525)

Bumps node from 11.15.0-alpine to 18.9.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump moment from 2.29.1 to 2.29.4 in /client-report (compdemocracy#1514)
4e7dd51 
Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](moment/moment@2.29.1...2.29.4)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump ws from 7.4.2 to 7.5.7 in /client-admin (compdemocracy#1395)
0224f8e 
Bumps [ws](https://github.com/websockets/ws) from 7.4.2 to 7.5.7.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@7.4.2...7.5.7)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump got and nodemon in /server (compdemocracy#1539)
0c18e1e 
Removes [got](https://github.com/sindresorhus/got). It's no longer used after updating ancestor dependency [nodemon](https://github.com/remy/nodemon). These dependencies need to be updated together.


Removes `got`

Updates `nodemon` from 2.0.7 to 2.0.20
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](remy/nodemon@v2.0.7...v2.0.20)

---
updated-dependencies:
- dependency-name: got
  dependency-type: indirect
- dependency-name: nodemon
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump y18n from 3.2.1 to 3.2.2 in /client-report (compdemocracy#932)
fa1e75b 
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump minimist from 1.2.5 to 1.2.6 in /client-admin (compdemocracy#1384)
0e8263b 
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@SvenSt-BIE
Update de_de.js
3a2f536 
Checked german language (native speaker). Corrected some inconsistencies and grammar errors.
@SvenSt-BIE
Update de_de.js
358dc53
patcon
patcon reviewed Oct 19, 2022
View reviewed changes
client-admin/Dockerfile Outdated
@@ -1,5 +1,5 @@
# Gulp v3 stops us from upgrading beyond Node v11
FROM docker.io/node:11.15.0-alpine
FROM docker.io/node:18.9.0-alpine
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to upgrade this as well? Usually pull requests strive to only touch the pieces of code that are relevant to the work (this change seems a bit more contentious, and might break things are require package updates)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also curious whether package-lock.json needed to be updated :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, no idea. I am not a developer and not versed in using github. Simply went through the translation as a favour to one of the original devs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is somewhat our fault actually. We merged some dependency updated (from dependabot) which we later had to revert. It looks like @SvenSt-BIE made his changes on top of those dependency updates prior to our reversion.

whilo
whilo suggested changes Oct 22, 2022
View reviewed changes
Copy link

@whilo whilo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have read through the whole file everything else looks ok.

client-participation/js/strings/de_de.js Outdated
@@ -20,7 +20,7 @@ s.modImportant = "Wichtig";
s.modSubmitInitialState = "Überspringen (nichts davon ist zutreffend), nächstes Statement";
s.modSubmit = "Fertig, nächstes Statement";

s.x_wrote = "schrieb:";
s.x_wrote = "hat geschrieb:";
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hat geschrieben

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Obwohl hier vermutlich "schrieb" die gängigere Form ist.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Danke für die Korrektur. Dumme Frage eine GuiHub Noobs: Wie ändere ich den Pull Request nun?

Zur Frage "hat geschrieben" vs. "schrieb": Ich verstehe den Einwand. Jeder Deutschlehrer würde wohl in der Schriftsprache "schrieb" bevorzugen. Ausschlaggebend war für mich am Ende, dass die Software möglichst inklusiv sein sollte. In den Regeln zur "leichten Sprache" wird vorgeschlagen, nur Präsens und Perfekt zu verwenden und niemals Präteritum. Es ist wohl für nicht-Muttersprachler leichter...warum auch immer....

Copy link
Contributor

@patcon patcon Oct 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For linguistically-impoverished english-speaking folks, eager to follow along 🙂

Obwohl hier vermutlich "schrieb" die gängigere Form ist.

Although "wrote" is probably the more common form here.

Danke für die Korrektur. Dumme Frage eine GuiHub Noobs: Wie ändere ich den Pull Request nun?

Zur Frage "hat geschrieben" vs. "schrieb": Ich verstehe den Einwand. Jeder Deutschlehrer würde wohl in der Schriftsprache "schrieb" bevorzugen. Ausschlaggebend war für mich am Ende, dass die Software möglichst inklusiv sein sollte. In den Regeln zur "leichten Sprache" wird vorgeschlagen, nur Präsens und Perfekt zu verwenden und niemals Präteritum. Es ist wohl für nicht-Muttersprachler leichter...warum auch immer....

Thanks for the correction. Stupid question from a GuiHub noob: How do I change the pull request now?

Regarding the question "has written" vs. "wrote": I understand the objection. Every German teacher would probably prefer "wrote" in written language. In the end, the decisive factor for me was that the software should be as inclusive as possible. In the rules for "easy language" it is suggested to use only present and perfect tense and never past tense. It's probably easier for non-native speakers...for whatever reason....

Copy link
Contributor

@patcon patcon Oct 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re: changing PR. the easiest way to make a "suggestion" (which anyone can do, including me), is to click the little "plus-minus" button in one of these line comments. This adds some text to the comment box:

Screen Shot 2022-10-24 at 3 14 49 PM

```suggestion
s.x_wrote = "hat geschrieb:";
```

If I replace the text with a change (like below), it renders like the box below, and can be merged in with a button-click:

```suggestion
s.x_wrote = "schrieb:";
```
Suggested change
s.x_wrote = "hat geschrieb:";
s.x_wrote = "schrieb:";

EDIT: Either you (as PR author) or the maintainer of the upstream repo (anyone at compdem) can click the button to merge :) Hope this helps!

@metasoarous metasoarous force-pushed the German-Language-Editing branch from 85a876a to 2969012 Compare December 3, 2022 01:53
@metasoarous metasoarous merged commit 1287245 into compdemocracy:edge Dec 5, 2022
brendanarnold added a commit to DFE-Digital/polis-whitelabel that referenced this pull request Dec 11, 2022
@brendanarnold @patcon
@metasoarous @xeeg @colinmegill @SvenSt-BIE @dependabot
ISSUE:#30 - Migrate client-admin to Webpack (#31)
e6a18eb 
* Migrate client-admin from gulp to webpack (compdemocracy#1242)

* First-pass gulp-to-webpack conversion.

* Update webpack-cli, and create prod/dev logic.

* Messy: leave uncompressed files in dev mode build.

* Shut off compression in dev mode more elegantly.

* Get docker build working.

* Fixed bundlewatch path to find client-admin files.

* Get rid of old webpack build scripts.

* Don't minify for dev build.

* Removed dep pkgs for s3 deploy.

* Added ability to use bundle analyzer plugin.

* Removed all unneeded files.

* Fixed up eslint issue with upgraded packages.

* Fixed bundlewatch CI script.

* Keep new client-admin bundle consistently named.

* Try running e2e tests against sslip.io instead of localhost.

* Escape the domainWhitelist strings as it was done before.

* Revert "Try running e2e tests against sslip.io instead of localhost."

This reverts commit 46722d0.

* Oops. Inversed the boolean for configs.

* Trying to debug index_admin.html issue.

* Added upterm for remote debugging.

* Ensure upterm runs on failures.

* Added publicPath to make script link absolute.

* Drop the embed.html test file into new home.

* Ensuring dev mode builds and dev server use same simplifications.

* Set up all routes to point to index.html. Added mention of future proxy.

* Removed debugging step from github actions.

* Tiny fixups to clean up PR.

* Only write headerJson files during prod build.

* Migrate from dist to more build as before.

* Removed unneeded config vars.

* Cleaned up webpack dev-mode logic.

* Went back to using dist folder to fix bundle-analyzer bug.

* Updated client-admin README. Removed badges. Removed deployment references.

* Cleaned up ignorefiles.

* Mention where builds happen.

* Use build instead of dist for client-admin build output

* switch to npm run build:prod in file-server/Dockerfile

* inject compiled js in html body for client-admin

* add/update webpack versions

Co-authored-by: Christopher Small <[email protected]>

* Adding farsi translation (compdemocracy#1560)

* Adding farsi translation

* Update client-participation/js/strings.js

Co-authored-by: Patrick Connolly <[email protected]>

Co-authored-by: Colin Megill <[email protected]>
Co-authored-by: Patrick Connolly <[email protected]>

* German language editing (compdemocracy#1552)

* Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-admin (compdemocracy#1523)

Bumps node from 11.15.0-alpine to 18.9.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-report (compdemocracy#1525)

Bumps node from 11.15.0-alpine to 18.9.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump moment from 2.29.1 to 2.29.4 in /client-report (compdemocracy#1514)

Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](moment/moment@2.29.1...2.29.4)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ws from 7.4.2 to 7.5.7 in /client-admin (compdemocracy#1395)

Bumps [ws](https://github.com/websockets/ws) from 7.4.2 to 7.5.7.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@7.4.2...7.5.7)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump got and nodemon in /server (compdemocracy#1539)

Removes [got](https://github.com/sindresorhus/got). It's no longer used after updating ancestor dependency [nodemon](https://github.com/remy/nodemon). These dependencies need to be updated together.


Removes `got`

Updates `nodemon` from 2.0.7 to 2.0.20
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](remy/nodemon@v2.0.7...v2.0.20)

---
updated-dependencies:
- dependency-name: got
  dependency-type: indirect
- dependency-name: nodemon
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump y18n from 3.2.1 to 3.2.2 in /client-report (compdemocracy#932)

Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump minimist from 1.2.5 to 1.2.6 in /client-admin (compdemocracy#1384)

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update de_de.js

Checked german language (native speaker). Corrected some inconsistencies and grammar errors.

* Update de_de.js

* Update de_de.js

* Revert "Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-admin (compdemocracy#1523)"

This reverts commit 0d1242f.

* Revert "Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-report (compdemocracy#1525)"

This reverts commit 54ed279.

* Revert "Bump moment from 2.29.1 to 2.29.4 in /client-report (compdemocracy#1514)"

This reverts commit 4e7dd51.

* Revert "Bump ws from 7.4.2 to 7.5.7 in /client-admin (compdemocracy#1395)"

This reverts commit 0224f8e.

* Revert "Bump got and nodemon in /server (compdemocracy#1539)"

This reverts commit 0c18e1e.

* Revert "Bump minimist from 1.2.5 to 1.2.6 in /client-admin (compdemocracy#1384)"

This reverts commit 0e8263b.

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Christopher Small <[email protected]>

* Update CHANGELOG

* Remove boolean, DISABLE_PLANS and DISABLE_INTERCOM

* Tidied up package.json

* Remove advice on cache clear - not needed for NPM > 5

* Rebuilt package-lock for e2e to fix tests

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Patrick Connolly <[email protected]>
Co-authored-by: Christopher Small <[email protected]>
Co-authored-by: Hadjar Homaei <[email protected]>
Co-authored-by: Colin Megill <[email protected]>
Co-authored-by: SvenSt-BIE <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
ballPointPenguin pushed a commit that referenced this pull request Feb 26, 2023
@dependabot @ballPointPenguin
Merge branch 'edge' into colinmegill/client-report-package-upgrades
a5b7e07 
* edge: (22 commits)
  Configuration unification (#1617)
  housekeeping (#1622)
  Remove intercom (#1547)
  Reduced bundlesize by requiring only victory-core for VictoryAnimation component. (#1618)
  A variety of improvements all around (#1608)
  Update client-participation dependencies, and get off gulp -> webpack (#1607)
  Feature/crkrenn/fixed participants extended sql table (#1586)
  Switch server to debian (#1600)
  More slack removal (#1599)
  Update server node & misc dep versions (#1595)
  switch from npm ci to npm install in client dockerfiles (#1594)
  deleted docker_cloud_notes (#1597)
  Remove slack (#1585)
  specify bullseye debian base for math dockerfile (#1590)
  Feature/crkrenn/improved makefile (#1577)
  Adding direction to the client- participation (#1561)
  update winston package (#1584)
  add scaling roadmap doc (#1582)
  Feature/sirodoht crk/e2e version 11 (#1576)
  German language editing (#1552)
  ...
ballPointPenguin pushed a commit that referenced this pull request Mar 4, 2023
@dependabot @ballPointPenguin
Merge branch 'edge' into colinmegill/client-report-package-upgrades
7b21809 
* edge: (22 commits)
  Configuration unification (#1617)
  housekeeping (#1622)
  Remove intercom (#1547)
  Reduced bundlesize by requiring only victory-core for VictoryAnimation component. (#1618)
  A variety of improvements all around (#1608)
  Update client-participation dependencies, and get off gulp -> webpack (#1607)
  Feature/crkrenn/fixed participants extended sql table (#1586)
  Switch server to debian (#1600)
  More slack removal (#1599)
  Update server node & misc dep versions (#1595)
  switch from npm ci to npm install in client dockerfiles (#1594)
  deleted docker_cloud_notes (#1597)
  Remove slack (#1585)
  specify bullseye debian base for math dockerfile (#1590)
  Feature/crkrenn/improved makefile (#1577)
  Adding direction to the client- participation (#1561)
  update winston package (#1584)
  add scaling roadmap doc (#1582)
  Feature/sirodoht crk/e2e version 11 (#1576)
  German language editing (#1552)
  ...
ballPointPenguin pushed a commit that referenced this pull request Mar 5, 2023
@dependabot @ballPointPenguin
Merge branch 'edge' into colinmegill/client-report-package-upgrades
c834c6f 
* edge: (22 commits)
  Configuration unification (#1617)
  housekeeping (#1622)
  Remove intercom (#1547)
  Reduced bundlesize by requiring only victory-core for VictoryAnimation component. (#1618)
  A variety of improvements all around (#1608)
  Update client-participation dependencies, and get off gulp -> webpack (#1607)
  Feature/crkrenn/fixed participants extended sql table (#1586)
  Switch server to debian (#1600)
  More slack removal (#1599)
  Update server node & misc dep versions (#1595)
  switch from npm ci to npm install in client dockerfiles (#1594)
  deleted docker_cloud_notes (#1597)
  Remove slack (#1585)
  specify bullseye debian base for math dockerfile (#1590)
  Feature/crkrenn/improved makefile (#1577)
  Adding direction to the client- participation (#1561)
  update winston package (#1584)
  add scaling roadmap doc (#1582)
  Feature/sirodoht crk/e2e version 11 (#1576)
  German language editing (#1552)
  ...
ballPointPenguin pushed a commit that referenced this pull request Mar 6, 2023
@dependabot @ballPointPenguin
Merge branch 'edge' into colinmegill/client-report-package-upgrades
ecf0898 
* edge: (22 commits)
  Configuration unification (#1617)
  housekeeping (#1622)
  Remove intercom (#1547)
  Reduced bundlesize by requiring only victory-core for VictoryAnimation component. (#1618)
  A variety of improvements all around (#1608)
  Update client-participation dependencies, and get off gulp -> webpack (#1607)
  Feature/crkrenn/fixed participants extended sql table (#1586)
  Switch server to debian (#1600)
  More slack removal (#1599)
  Update server node & misc dep versions (#1595)
  switch from npm ci to npm install in client dockerfiles (#1594)
  deleted docker_cloud_notes (#1597)
  Remove slack (#1585)
  specify bullseye debian base for math dockerfile (#1590)
  Feature/crkrenn/improved makefile (#1577)
  Adding direction to the client- participation (#1561)
  update winston package (#1584)
  add scaling roadmap doc (#1582)
  Feature/sirodoht crk/e2e version 11 (#1576)
  German language editing (#1552)
  ...
brendanarnold pushed a commit to DFE-Digital/polis-whitelabel that referenced this pull request Apr 3, 2023
@dependabot @metasoarous
German language editing (compdemocracy#1552)
7ab0e04 
* Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-admin (compdemocracy#1523)

Bumps node from 11.15.0-alpine to 18.9.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-report (compdemocracy#1525)

Bumps node from 11.15.0-alpine to 18.9.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump moment from 2.29.1 to 2.29.4 in /client-report (compdemocracy#1514)

Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](moment/moment@2.29.1...2.29.4)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ws from 7.4.2 to 7.5.7 in /client-admin (compdemocracy#1395)

Bumps [ws](https://github.com/websockets/ws) from 7.4.2 to 7.5.7.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@7.4.2...7.5.7)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump got and nodemon in /server (compdemocracy#1539)

Removes [got](https://github.com/sindresorhus/got). It's no longer used after updating ancestor dependency [nodemon](https://github.com/remy/nodemon). These dependencies need to be updated together.

Removes `got`

Updates `nodemon` from 2.0.7 to 2.0.20
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](remy/nodemon@v2.0.7...v2.0.20)

---
updated-dependencies:
- dependency-name: got
  dependency-type: indirect
- dependency-name: nodemon
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump y18n from 3.2.1 to 3.2.2 in /client-report (compdemocracy#932)

Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump minimist from 1.2.5 to 1.2.6 in /client-admin (compdemocracy#1384)

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update de_de.js

Checked german language (native speaker). Corrected some inconsistencies and grammar errors.

* Update de_de.js

* Update de_de.js

* Revert "Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-admin (compdemocracy#1523)"

This reverts commit 0d1242f.

* Revert "Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-report (compdemocracy#1525)"

This reverts commit 54ed279.

* Revert "Bump moment from 2.29.1 to 2.29.4 in /client-report (compdemocracy#1514)"

This reverts commit 4e7dd51.

* Revert "Bump ws from 7.4.2 to 7.5.7 in /client-admin (compdemocracy#1395)"

This reverts commit 0224f8e.

* Revert "Bump got and nodemon in /server (compdemocracy#1539)"

This reverts commit 0c18e1e.

* Revert "Bump minimist from 1.2.5 to 1.2.6 in /client-admin (compdemocracy#1384)"

This reverts commit 0e8263b.

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Christopher Small <[email protected]>
brendanarnold added a commit to DFE-Digital/polis-whitelabel that referenced this pull request Apr 4, 2023
@brendanarnold @xeeg
@colinmegill @patcon @metasoarous @dependabot
ISSUE: #66 - Improve language support (#74)
c872158 
* Adding farsi translation (compdemocracy#1560)

* Adding farsi translation

* Update client-participation/js/strings.js

Co-authored-by: Patrick Connolly <[email protected]>

Co-authored-by: Colin Megill <[email protected]>
Co-authored-by: Patrick Connolly <[email protected]>

* Adding direction to the client- participation (compdemocracy#1561)

* Adding direction to the participation

* Set client-participation text directions to auto and match css styles to flexibly adapt

* Adjust css styles in css files, modules and admin section

* Fixing the issue in statement margins caused by paragraph direction overriding page direction

* switch from dir to direction for rtl vs ltr specificaiton in strings files

* add direction to Farsi and Hebrew strings files

* Fixing remaining comments floating issue on chrome

Co-authored-by: Christopher Small <[email protected]>

* German language editing (compdemocracy#1552)

* Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-admin (compdemocracy#1523)

Bumps node from 11.15.0-alpine to 18.9.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-report (compdemocracy#1525)

Bumps node from 11.15.0-alpine to 18.9.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump moment from 2.29.1 to 2.29.4 in /client-report (compdemocracy#1514)

Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](moment/moment@2.29.1...2.29.4)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ws from 7.4.2 to 7.5.7 in /client-admin (compdemocracy#1395)

Bumps [ws](https://github.com/websockets/ws) from 7.4.2 to 7.5.7.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@7.4.2...7.5.7)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump got and nodemon in /server (compdemocracy#1539)

Removes [got](https://github.com/sindresorhus/got). It's no longer used after updating ancestor dependency [nodemon](https://github.com/remy/nodemon). These dependencies need to be updated together.

Removes `got`

Updates `nodemon` from 2.0.7 to 2.0.20
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](remy/nodemon@v2.0.7...v2.0.20)

---
updated-dependencies:
- dependency-name: got
  dependency-type: indirect
- dependency-name: nodemon
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump y18n from 3.2.1 to 3.2.2 in /client-report (compdemocracy#932)

Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump minimist from 1.2.5 to 1.2.6 in /client-admin (compdemocracy#1384)

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update de_de.js

Checked german language (native speaker). Corrected some inconsistencies and grammar errors.

* Update de_de.js

* Update de_de.js

* Revert "Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-admin (compdemocracy#1523)"

This reverts commit 0d1242f.

* Revert "Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-report (compdemocracy#1525)"

This reverts commit 54ed279.

* Revert "Bump moment from 2.29.1 to 2.29.4 in /client-report (compdemocracy#1514)"

This reverts commit 4e7dd51.

* Revert "Bump ws from 7.4.2 to 7.5.7 in /client-admin (compdemocracy#1395)"

This reverts commit 0224f8e.

* Revert "Bump got and nodemon in /server (compdemocracy#1539)"

This reverts commit 0c18e1e.

* Revert "Bump minimist from 1.2.5 to 1.2.6 in /client-admin (compdemocracy#1384)"

This reverts commit 0e8263b.

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Christopher Small <[email protected]>

* Update CHANGELOG

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Hadjar Homaei <[email protected]>
Co-authored-by: Colin Megill <[email protected]>
Co-authored-by: Patrick Connolly <[email protected]>
Co-authored-by: Christopher Small <[email protected]>
Co-authored-by: Brendan Arnold <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@patcon patcon patcon left review comments

@whilo whilo whilo requested changes

@colinmegill colinmegill Awaiting requested review from colinmegill

@metasoarous metasoarous Awaiting requested review from metasoarous

@ballPointPenguin ballPointPenguin Awaiting requested review from ballPointPenguin

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@SvenSt-BIE @metasoarous @patcon @whilo