Skip to content

Commit

Permalink
Merge pull request #1062 from rodekruis/develop
Browse files Browse the repository at this point in the history
v24.06.1
  • Loading branch information
elwinschmitz authored Jun 28, 2024
2 parents a4c841b + f08a5a1 commit 773b6ba
Show file tree
Hide file tree
Showing 20 changed files with 2,687 additions and 1,950 deletions.
14 changes: 12 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,21 @@ NG_USE_Q_AND_AS=true
# Enable Search-feature for 'Q & A's (Possible value: `true` or leave empty for `false`)
NG_USE_Q_AND_A_SEARCH=true

# Enable Feedback-prompt on Sub-Category and Offer pages (Possible value: `true` or leave empty for `false`)
NG_USE_FEEDBACK_PROMPT=true

# Enable language-switcher to switch between Regions (Possible value: `true` or leave empty for `false`)
NG_USE_REGION_PER_LOCALE=true

# Enable Feedback-prompt on Sub-Category and Offer pages (Possible value: `true` or leave empty for `false`)
NG_USE_FEEDBACK_PROMPT=true
# Default language
NG_LOCALE_LANGUAGE=en
# Default language direction (Possible values: "ltr" or "rtl")
NG_LOCALE_DIR=ltr
# Available language options (Comma-separated list like: "<language-code>:<language-name>,en:English,*:Other...")
# To disable the language-switcher on the main-page, or when using `NG_USE_REGION_PER_LOCALE=true`, set this to: ""
NG_LOCALE_ALTERNATIVES="ar:العربية, en:English, nl:Nederlands, *:Other..."
# An (optional) explanation below the list of available language options (i.e "* Using Google Translate")
NG_LOCALE_ALTERNATIVES_EXPLANATION="* Using Google Translate"

# Define the logo used on the main/front-page by an absolute URL (starting with https://)
TXT_APP_LOGO_URL=
Expand Down
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,28 @@
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
This project uses the [`CalVer`](https://calver.org/#scheme)-format: `YY.0M.MICRO`.

---

## [Unreleased](https://github.com/rodekruis/helpful-information/compare/v24.06.0...main)
## [Unreleased](https://github.com/rodekruis/helpful-information/compare/v24.06.1...main)

---

## 2024-06-28: [v24.06.1](https://github.com/rodekruis/helpful-information/releases/tag/v24.06.1)

### Added

- Language-switcher now also available on the Main-page. (when configured via [`ENV`](.env.example)-variables)

### Fixed

- Links to Main-page(the Logo, "Try Again"-link) now takes into account if deployed in a sub-folder or on (sub-)domain.

### Changed

- Upgrade to Angular v18 + Ionic v7

### Removed

- No more URL-rewriting/redirecting for 'old-style' URLs using query-parameters only.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ During development, an automated watch-process can be run with:

- [Ionic v8](https://ionicframework.com/docs/)
> ⚠️ The [`Ionicons`](https://ionic.io/ionicons) icon-set is NOT included in the final build, so cannot be used 'by default'. Icons can be added manually.
- [Angular v17](https://v17.angular.io/docs/)
- [Angular v18](https://v18.angular.io/docs/)
- [`ngx-markdown`](https://www.npmjs.com/package/ngx-markdown) is used to process Markdown-content into HTML. _No_ optional dependencies are included/used.

### Updating dependencies
Expand Down
8 changes: 2 additions & 6 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:browser-esbuild",
"options": {
"outputPath": "www",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"polyfills": ["src/polyfills.ts"],
"tsConfig": "src/tsconfig.app.json",
"assets": [
{
Expand Down Expand Up @@ -55,9 +55,7 @@
}
],
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
Expand All @@ -74,8 +72,6 @@
"outputHashing": "all",
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
Expand Down
2 changes: 1 addition & 1 deletion data/test-sheet-id-1/values/Referral Page.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
],
[
"Label: Alternative languages explanation\n#locale.alternatives.explanation",
"* Translations via Google",
"(Not all content is available in all languages.)",
"\"Using Google Translate.\", \"(Translate with Google Translate.)\" or empty when using sheets-as-languages"
],
[
Expand Down
Loading

0 comments on commit 773b6ba

Please sign in to comment.