diff options
author | Ricardo Cino <ricardo@cino.io> | 2022-06-22 00:10:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-21 22:10:27 +0000 |
commit | aec118d05b23813df03d9791fb1dfd31fc81a6e3 (patch) | |
tree | c7447a9fa5a95c8f43257865ce923dc2dfc2bc4d | |
parent | Change styling on settings (diff) | |
download | ferdium-app-aec118d05b23813df03d9791fb1dfd31fc81a6e3.tar.gz ferdium-app-aec118d05b23813df03d9791fb1dfd31fc81a6e3.tar.zst ferdium-app-aec118d05b23813df03d9791fb1dfd31fc81a6e3.zip |
Remove DevContainer from project [skip ci]
-rw-r--r-- | .devcontainer/Dockerfile | 16 | ||||
-rw-r--r-- | .devcontainer/devcontainer.json | 29 | ||||
-rw-r--r-- | .dockerignore | 1 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 6 |
4 files changed, 3 insertions, 49 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index 1fe3880c8..000000000 --- a/.devcontainer/Dockerfile +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.174.0/containers/javascript-node/.devcontainer/base.Dockerfile | ||
2 | |||
3 | # [Choice] Node.js version: 18 | ||
4 | ARG VARIANT="18-buster" | ||
5 | FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} | ||
6 | |||
7 | # [Optional] Uncomment this section to install additional OS packages. | ||
8 | # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ | ||
9 | # && apt-get -y install --no-install-recommends <your-package-list-here> | ||
10 | |||
11 | # [Optional] Uncomment if you want to install an additional version of node using nvm | ||
12 | # ARG EXTRA_NODE_VERSION=10 | ||
13 | # RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}" | ||
14 | |||
15 | # [Optional] Uncomment if you want to install more global node modules | ||
16 | # RUN su node -c "npm i -g <your-package-list-here>" | ||
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 10c2fb733..000000000 --- a/.devcontainer/devcontainer.json +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: | ||
2 | // https://github.com/microsoft/vscode-dev-containers/tree/v0.174.0/containers/javascript-node | ||
3 | { | ||
4 | "name": "Node.js", | ||
5 | "build": { | ||
6 | "dockerfile": "Dockerfile", | ||
7 | // Update 'VARIANT' to pick a Node version: 10, 12, 14 | ||
8 | "args": { | ||
9 | "VARIANT": "14" | ||
10 | } | ||
11 | }, | ||
12 | |||
13 | // Set *default* container specific settings.json values on container create. | ||
14 | "settings": { | ||
15 | "terminal.integrated.defaultProfile.linux": "/bin/bash" | ||
16 | }, | ||
17 | |||
18 | // Add the IDs of extensions you want installed when the container is created. | ||
19 | "extensions": ["dbaeumer.vscode-eslint"], | ||
20 | |||
21 | // Use 'forwardPorts' to make a list of ports inside the container available locally. | ||
22 | // "forwardPorts": [], | ||
23 | |||
24 | // Use 'postCreateCommand' to run commands after the container is created. | ||
25 | // "postCreateCommand": "npm i", | ||
26 | |||
27 | // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. | ||
28 | "remoteUser": "node" | ||
29 | } | ||
diff --git a/.dockerignore b/.dockerignore index bc860729d..57561245a 100644 --- a/.dockerignore +++ b/.dockerignore | |||
@@ -1,5 +1,4 @@ | |||
1 | .all-contributorsrc | 1 | .all-contributorsrc |
2 | .devcontainer | ||
3 | .dockerignore | 2 | .dockerignore |
4 | .editorconfig | 3 | .editorconfig |
5 | .husky/ | 4 | .husky/ |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index a08cf7bea..62b84f093 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -272,14 +272,14 @@ | |||
272 | "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdium.", | 272 | "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdium.", |
273 | "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", | 273 | "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", |
274 | "settings.app.sectionAccentColorSettings": "Accent Color Settings", | 274 | "settings.app.sectionAccentColorSettings": "Accent Color Settings", |
275 | "settings.app.sectionAdvanced": "Advanced Settings", | ||
275 | "settings.app.sectionGeneralUi": "General UI", | 276 | "settings.app.sectionGeneralUi": "General UI", |
276 | "settings.app.sectionHibernation": "Hibernation", | 277 | "settings.app.sectionHibernation": "Hibernation", |
278 | "settings.app.sectionLanguage": "Language Settings", | ||
277 | "settings.app.sectionMain": "Main", | 279 | "settings.app.sectionMain": "Main", |
280 | "settings.app.sectionPrivacy": "Privacy Settings", | ||
278 | "settings.app.sectionServiceIconsSettings": "Service Icons Settings", | 281 | "settings.app.sectionServiceIconsSettings": "Service Icons Settings", |
279 | "settings.app.sectionSidebarSettings": "Sidebar Settings", | 282 | "settings.app.sectionSidebarSettings": "Sidebar Settings", |
280 | "settings.app.sectionPrivacy": "Privacy Settings", | ||
281 | "settings.app.sectionLanguage": "Language Settings", | ||
282 | "settings.app.sectionAdvanced": "Advanced Settings", | ||
283 | "settings.app.sectionUpdates": "App Updates Settings", | 283 | "settings.app.sectionUpdates": "App Updates Settings", |
284 | "settings.app.spellCheckerLanguageInfo": "Ferdium uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.", | 284 | "settings.app.spellCheckerLanguageInfo": "Ferdium uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.", |
285 | "settings.app.subheadlineCache": "Cache", | 285 | "settings.app.subheadlineCache": "Cache", |