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.

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

Release 3.0 | Update TAN FAQs #3321

Merged
merged 10 commits into from
Jan 18, 2023
Merged

Release 3.0 | Update TAN FAQs #3321

merged 10 commits into from
Jan 18, 2023

Conversation

MohamedZaghdoudi
Copy link
Contributor

@MohamedZaghdoudi MohamedZaghdoudi commented Jan 11, 2023

The PR is about the updates of the Release 3.0 in FAQ-EN and FAQ-DE

The date at the top is a placeholder. This is so that we can replace the dates of all affected FAQs at once when they're in the 3.0 branch.

image

image


Internal Tracking ID: EXPOSUREAPP-14496

@MohamedZaghdoudi MohamedZaghdoudi requested a review from a team January 11, 2023 08:03
@MohamedZaghdoudi MohamedZaghdoudi marked this pull request as draft January 11, 2023 08:04
@larswmh larswmh changed the title Update faq Release 3.0 | Update TAN FAQs Jan 11, 2023
@MikeMcC399

This comment was marked as resolved.

@MikeMcC399
Copy link
Contributor

@MohamedZaghdoudi

You can check your branch before you push it to GitHub by using:

npm run test:short

This will give the same error about the missing FAQ article #warn_without_tan.

The app should be called "Corona-Warn-App" not "Corona Warning App" as this is the name used everywhere else, including in the English app stores.

D.h. like all similar German abbreviations should be written with   i.e.D. h.

I will look in more detail when the PR goes from Draft into review mode.

Copy link
Member

@larswmh larswmh left a comment

Choose a reason for hiding this comment

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

In addition to my comments, the English TAN Glossary still needs to be updated

src/data/faq.json Outdated Show resolved Hide resolved
src/data/faq.json Outdated Show resolved Hide resolved
src/data/faq.json Outdated Show resolved Hide resolved
src/data/faq.json Outdated Show resolved Hide resolved
src/data/faq.json Outdated Show resolved Hide resolved
src/data/faq_de.json Outdated Show resolved Hide resolved
src/data/faq_de.json Outdated Show resolved Hide resolved
src/data/faq.json Outdated Show resolved Hide resolved
src/data/faq.json Outdated Show resolved Hide resolved
src/data/faq.json Outdated Show resolved Hide resolved
@dsarkar dsarkar marked this pull request as ready for review January 11, 2023 11:34
MohamedZaghdoudi and others added 2 commits January 11, 2023 16:47
Co-authored-by: Lars <lars.wittmershaus@cuisine.digital>
src/data/faq.json Outdated Show resolved Hide resolved
Co-authored-by: Lars <lars.wittmershaus@cuisine.digital>
@MikeMcC399
Copy link
Contributor

@larswmh
Did you consider using gulp variables for the unknown dates?
That would make it easier to test instead of using ??????r etc. as pseudo-variables.

As in:

cwa-website/gulpfile.mjs

Lines 525 to 531 in bf6a665

.pipe(replace('[ios.minimum-required-os-version]', '12.5'))
.pipe(replace('[ios.minimum-app-version]', '1.5.3'))
.pipe(replace('[ios.current-app-version]', '2.28.0'))
.pipe(replace('[android.latest-os-version]', '13'))
.pipe(replace('[android.minimum-required-os-version]', '6'))
.pipe(replace('[android.minimum-app-version]', '1.0.4'))
.pipe(replace('[android.current-app-version]', '2.28.3'))

@larswmh
Copy link
Member

larswmh commented Jan 12, 2023

@MikeMcC399

Did you consider using gulp variables for the unknown dates?
That would make it easier to test instead of using ??????r etc. as pseudo-variables.

I'm not sure if I understand this correctly. For testing and reviewing, I don't think it the variable matters. As seen in this PR, I could have come up with better ones, as they can easily be confused, but since we're now already in the process, we should stick to them.
Our plan is to merge all of these PRs with these variables into the release/3.0 branch before the release, and then replace all those variables with the correct date at once right before merging into master

src/data/faq.json Outdated Show resolved Hide resolved
src/data/faq.json Outdated Show resolved Hide resolved
src/data/faq.json Outdated Show resolved Hide resolved
src/data/faq.json Outdated Show resolved Hide resolved
src/data/faq.json Outdated Show resolved Hide resolved
src/data/faq.json Outdated Show resolved Hide resolved
@MikeMcC399
Copy link
Contributor

In the English text there are many places which use "teleTAN" without the indefinite article. It should be "a teleTAN". I have only marked up some of them. They should however all be changed.

src/data/faq.json Outdated Show resolved Hide resolved
src/data/faq.json Outdated Show resolved Hide resolved
Copy link
Contributor

@MikeMcC399 MikeMcC399 left a comment

Choose a reason for hiding this comment

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

See also in-line comments

@dsarkar
Copy link
Member

dsarkar commented Jan 17, 2023

@MikeMcC399 Thanks for reviewing !

@larswmh larswmh merged commit 658878b into release/3.0 Jan 18, 2023
@larswmh larswmh deleted the update-faq branch January 18, 2023 07:20
larswmh added a commit that referenced this pull request Jan 18, 2023
* Update gulpfile.js

* Update sitemap.json

* Update sitemap_de.json

* Create screenshots-archive-2-28_de.json

* Create screenshots-archive-2-28.json

* Update global.json

* Create 2-28.html

* Create 2-28.html

* Update appToWebLinks.json

* Update appToWebLinks.json

* Update sitemap.json

* Update sitemap_de.json

* Update appToWebLinks.json

add "#warn_without_tan",

* Update gulpfile.js

* Update gulpfile.mjs

* Release 3.0: Update FAQ articles mentioning "Warn for others" (#3312)

* Release 3.0: Update FAQ articles mentioning "Warn for others"

* Apply suggested changes

* Modify censored date for easier replacement later

* Update Android version to 3.0.1

* Release 3.0 | Update FAQ: Add "Warning without TAN" section (#3322)

* Update FAQ: Add Warning without TAN section

* Add to FAQ landing page index

* Apply suggestions from code review

Co-authored-by: Tim <67682506+Ein-Tim@users.noreply.github.com>

* Add rest of suggestions + English equivalents

* Update #warn_without_tan_still_positive

* Apply suggestions from code review

Co-authored-by: Tim <67682506+Ein-Tim@users.noreply.github.com>

* Apply suggestions from code review (+ English)

* Apply suggestions / add #warn_without_tan_differentiate_warning

* Apply suggestion

Co-authored-by: Tim <67682506+Ein-Tim@users.noreply.github.com>

* Translate suggestion + minor changes

Tagebuch -> Kontakt-Tagebuch
Fix indentation

* Update #warn_without_tan_in_app_display

* Correct title #warn_without_tan_sickness_certificate

Co-authored-by: Tim <67682506+Ein-Tim@users.noreply.github.com>

Co-authored-by: Tim <67682506+Ein-Tim@users.noreply.github.com>

* Release 3.0 | Update #further_details: Change link of pandemic radar (#3317)

* Release 3.0 | Update TAN FAQs (#3321)

* add updates for the FAQ for the release 3.0

* add some changes to the update of release 3.0

* Apply suggestions from code review

Co-authored-by: Lars <lars.wittmershaus@cuisine.digital>

* update the Tan in English

* Update src/data/faq.json

Co-authored-by: Lars <lars.wittmershaus@cuisine.digital>

* add some changes to faq.json

* add some changes in der FAQ

* Revert "add some changes in der FAQ"

This reverts commit e98c409.

* add changes in the FAQ text

* punctuation

Co-authored-by: Lars <lars.wittmershaus@cuisine.digital>
Co-authored-by: Dipankar Sarkar <dipankar.sarkar@cuisine.digital>

* [R 3.0] Screenshots (#3298)

* 2-29 folder

* Update screenshots_de.json

* Update screenshots.json

* 2.29 -> 3.0

* Update screenshots.json

2.9 -> 3.0

* 2022 -> 2023

* rename folder 2.29 -> 3.0

* Update global.json

2.29 -> 3.0

* Update sitemap_de.json

2022->2023

* Add 3.0 assets and compress

* Remove link to deleted screenshot section

* Fix double punctuation

Co-authored-by: larswmh <lars.wittmershaus@cuisine.digital>

* Replace dates

* Release 3.0 | Add blog (#3329)

* [R 3.0] Update privacy notice (#3173)

* Update privacy.json

* Update privacy_de.json

* rename docs

* add pdfs and set correct date

Co-authored-by: Lars <lars.wittmershaus@cuisine.digital>
Co-authored-by: Lars <wittmershaus.lars@gmail.com>
Co-authored-by: Tim <67682506+Ein-Tim@users.noreply.github.com>
Co-authored-by: MohamedZaghdoudi <117178964+MohamedZaghdoudi@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants