Asset cache-busting & i18n string additions

privacyguides · Apr 8, 2024 · 5fd3b36 · 5fd3b36
1 parent f35e64a
commit 5fd3b36
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/test-lint.yml b/.github/workflows/test-lint.yml
@@ -63,7 +63,7 @@ jobs:
           # ADD YOUR CUSTOM ENV VARIABLES HERE OR DEFINE THEM IN A FILE .mega-linter.yml AT THE ROOT OF YOUR REPOSITORY
           DISABLE: COPYPASTE,SPELL,HTML
           DISABLE_LINTERS: JSON_JSONLINT,MARKDOWN_MARKDOWN_TABLE_FORMATTER
-          DISABLE_ERRORS_LINTERS: CSS_STYLELINT,MARKDOWN_MARKDOWN_LINK_CHECK,YAML_YAMLLINT,DOCKERFILE_HADOLINT,REPOSITORY_TRIVY
+          DISABLE_ERRORS_LINTERS: CSS_STYLELINT,MARKDOWN_MARKDOWN_LINK_CHECK,YAML_YAMLLINT,DOCKERFILE_HADOLINT,REPOSITORY_TRIVY,REPOSITORY_CHECKOV
           EDITORCONFIG_EDITORCONFIG_CHECKER_ARGUMENTS: -disable-indentation
           ENV_DOTENV_LINTER_ARGUMENTS: "--skip QuoteCharacter"
           MARKDOWN_MARKDOWN_LINK_CHECK_FILTER_REGEX_INCLUDE: (docs)

diff --git a/config/mkdocs-common.yml b/config/mkdocs-common.yml
@@ -237,10 +237,10 @@ extra:
       ]
     cookies:
       analytics:
-        name: Self-Hosted Analytics
+        name: !ENV [ANALYTICS_COOKIE_UMAMI, "Self-Hosted Analytics"]
         checked: true
       github:
-        name: GitHub API
+        name: !ENV [ANALYTICS_COOKIE_GITHUB, "GitHub API"]
         checked: true
     actions:
       - reject
@@ -293,11 +293,11 @@ theme:
     - search.highlight
 
 extra_css:
-  - assets/stylesheets/extra.css?v=3.17.0
+  - assets/stylesheets/extra.css?v=1
 extra_javascript:
-  - assets/javascripts/randomize-element.js
-  - assets/javascripts/resolution.js
-  - assets/javascripts/feedback.js
+  - assets/javascripts/randomize-element.js?v=1
+  - assets/javascripts/resolution.js?v=1
+  - assets/javascripts/feedback.js?v=1
 
 watch:
   - ../theme

diff --git a/includes/strings.en.env b/includes/strings.en.env
@@ -1,5 +1,7 @@
 ANALYTICS_CONSENT_BODY="We collect anonymous statistics about your visits to help us improve the site. We do not track you across other websites. If you disable this, we will not know when you have visited our site. We will save a single cookie in your browser to remember your preference."
 ANALYTICS_CONSENT_TITLE="Contribute anonymous statistics"
+ANALYTICS_COOKIE_GITHUB="GitHub API"
+ANALYTICS_COOKIE_UMAMI="Self-Hosted Analytics"
 ANALYTICS_FEEDBACK_NEGATIVE_NAME="This page could be improved"
 ANALYTICS_FEEDBACK_NEGATIVE_NOTE='Thanks for your feedback! If you want to let us know more, please leave a post on our <a href="https://discuss.privacyguides.net/c/site-development/7" target="_blank" rel="noopener">forum</a>.'
 ANALYTICS_FEEDBACK_POSITIVE_NAME="This page was helpful"