Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

update yarn.lock and i18n #7476

Merged
merged 2 commits into from
Jan 7, 2022
Merged

update yarn.lock and i18n #7476

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55de189
add hash to matrix-web-i18n dep, update i18n
Jan 7, 2022
54b0b49
remove hash from dep
Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
"jest-raw-loader": "^1.0.1",
"matrix-mock-request": "^1.2.3",
"matrix-react-test-utils": "^0.2.3",
"matrix-web-i18n": "github:matrix-org/matrix-web-i18n",
"matrix-web-i18n": "github:matrix-org/matrix-web-i18n#a8a01807c057595948a6da3587516c46df77de18",
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm a bit concerned that the version will be fixed to a specific commit. Whereas before it would get automatically updated whenever something is pushed to the main branch.

Sometimes we might need to do yarn cache clean before re-installing the dependencies to make sure that yarn.lock gets updated with the correct revision

Copy link
Contributor Author

Choose a reason for hiding this comment

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

true, removing

"raw-loader": "^4.0.2",
"react-test-renderer": "^17.0.2",
"rimraf": "^3.0.2",
Expand Down
9 changes: 9 additions & 0 deletions src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2979,6 +2979,15 @@
"Community %(groupId)s not found": "Community %(groupId)s not found",
"This homeserver does not support communities": "This homeserver does not support communities",
"Failed to load %(groupId)s": "Failed to load %(groupId)s",
"Great, that'll help people know it's you": "Great, that'll help people know it's you",
"Add a photo so people know it's you.": "Add a photo so people know it's you.",
"Welcome %(name)s": "Welcome %(name)s",
"Now, let's help you get started": "Now, let's help you get started",
"Welcome to %(appName)s": "Welcome to %(appName)s",
"Own your conversations.": "Own your conversations.",
"Send a Direct Message": "Send a Direct Message",
"Explore Public Rooms": "Explore Public Rooms",
"Create a Group Chat": "Create a Group Chat",
"Upgrade to %(hostSignupBrand)s": "Upgrade to %(hostSignupBrand)s",
"Open dial pad": "Open dial pad",
"Public community": "Public community",
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6174,9 +6174,9 @@ matrix-react-test-utils@^0.2.3:
resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.3.tgz#27653f9d6bbfddd1856e51860fad1503b039d617"
integrity sha512-NKZDlMEQzDZDQhBYyKBUtqidRvpkww3n9/GmGICkxtU2D6NetyBIfvm1Lf9o7167KSkPHJUVvDS9dzaS55jUnA==

"matrix-web-i18n@github:matrix-org/matrix-web-i18n":
"matrix-web-i18n@github:matrix-org/matrix-web-i18n#a8a01807c057595948a6da3587516c46df77de18":
version "1.1.2"
resolved "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/e5c7071e0cdf715de87ef39dc8260e11d7add2f8"
resolved "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/a8a01807c057595948a6da3587516c46df77de18"
dependencies:
"@babel/parser" "^7.13.16"
"@babel/traverse" "^7.13.17"
Expand Down