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

Add russian localization #1354

Merged
merged 1 commit into from
Apr 19, 2022
Merged

Conversation

sevazhidkov
Copy link
Contributor

No description provided.

@colinmegill
Copy link
Member

Thanks for this contribution @sevazhidkov!

@sevazhidkov
Copy link
Contributor Author

It seems that the error failing the build isn't related to the PR.

I was able to make it work locally through these fixes (alongside running npm i in each folder after the updates so package-lock.json would update):

diff --git a/client-report/package.json b/client-report/package.json
index a4e58ba4..ab93a2e7 100644
--- a/client-report/package.json
+++ b/client-report/package.json
@@ -15,7 +15,7 @@
   "author": "Colin Megill",
   "license": "",
   "devDependencies": {
-    "knox": "git://github.com/caremerge/knox.git#b1e031c209b3c17cab622a458e87728c1ee88cbd",
+    "knox": "https://github.com/caremerge/knox.git#b1e031c209b3c17cab622a458e87728c1ee88cbd",
     "babel-core": "^5.8.25",
     "babel-eslint": "^4.1.3",
     "babel-loader": "^5.3.2",
diff --git a/server/package.json b/server/package.json
index be9ffe22..64efac77 100644
--- a/server/package.json
+++ b/server/package.json
@@ -16,7 +16,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/pol-is/polisServer.git"
+    "url": "https://github.com/pol-is/polisServer.git"
   },
   "author": "",
   "license": "AGPL-3.0",

@colinmegill, let me know what should I do: a) add these changes to this PR b) add these changes to a separate PR or something else.

@metasoarous
Copy link
Member

Hey @sevazhidkov; Thanks for submitting this PR, and for pointing out the knox dependency issue!

The knox issue has been solved now thanks to #1362. However, GitHub doesn't seem to run the CI tests on the theoretical PR merge, but rather based directly on the head branch, so I went ahead and created #1363 to merge this branch with those changes. Now it seems that we're getting a different set of CI tests failing, specifically the cypress integration tests. This is weird, since these same tests seemed to pass for @raulsperoni in #1362.

@sevazhidkov
Copy link
Contributor Author

Hey! I've launched the tests a few times, every time they failed in different places and, after multiple retries, they passed: https://github.com/sevazhidkov/polis/actions/runs/2086388973

Do you mind trying to retry the tests a few times? If they end up succeeding, it could unblock merging the localization PR before I figure out a reason for their flakiness.

@metasoarous
Copy link
Member

Hey @sevazhidkov; Thanks for your persistence with this.

I've got some other work I need to do on the deploy side right now, but once I'm through with that, I'll do as you suggest to try and get this merged in.

Thanks again!

@metasoarous
Copy link
Member

Merging this now; Thanks again @sevazhidkov!

@metasoarous metasoarous merged commit 5b0ea30 into compdemocracy:dev Apr 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants