diff options
-rw-r--r-- | client/src/locale/source/angular_en_US.xml | 31 | ||||
-rw-r--r-- | server/helpers/peertube-crypto.ts | 5 |
2 files changed, 15 insertions, 21 deletions
diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml index 4a71c6e17..e3c4e66a3 100644 --- a/client/src/locale/source/angular_en_US.xml +++ b/client/src/locale/source/angular_en_US.xml | |||
@@ -644,8 +644,8 @@ | |||
644 | <context context-type="sourcefile">app/signup/signup.component.html</context> | 644 | <context context-type="sourcefile">app/signup/signup.component.html</context> |
645 | <context context-type="linenumber">16</context> | 645 | <context context-type="linenumber">16</context> |
646 | </context-group> | 646 | </context-group> |
647 | </trans-unit><trans-unit id="2ac776627e18565d7ae85cd7f4cd033bc5d0c88b" datatype="html"> | 647 | </trans-unit><trans-unit id="7fe213724c4c0a4112c40c673884acb98a0a3b92" datatype="html"> |
648 | <source>I have read and agree to the <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Terms</a> of this instance</source> | 648 | <source>I am at least 16 years old and agree to the <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Terms</a> of this instance</source> |
649 | <context-group purpose="location"> | 649 | <context-group purpose="location"> |
650 | <context context-type="sourcefile">app/signup/signup.component.html</context> | 650 | <context context-type="sourcefile">app/signup/signup.component.html</context> |
651 | <context context-type="linenumber">54</context> | 651 | <context context-type="linenumber">54</context> |
@@ -1308,9 +1308,9 @@ | |||
1308 | <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context> | 1308 | <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context> |
1309 | <context context-type="linenumber">83</context> | 1309 | <context context-type="linenumber">83</context> |
1310 | </context-group> | 1310 | </context-group> |
1311 | </trans-unit><trans-unit id="d8f1c6b816aaf1ebcb936a705dbe88bcef28eaa8" datatype="html"> | 1311 | </trans-unit><trans-unit id="b1372cb61ca791a0f7f95bf31c86c97df142adc4" datatype="html"> |
1312 | <source> | 1312 | <source> |
1313 | PeerTube is only in beta, and want to deliver the best countermeasures possible by the time the stable is released. | 1313 | PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released. |
1314 | In the meantime, we want to test different ideas related to this issue: | 1314 | In the meantime, we want to test different ideas related to this issue: |
1315 | </source> | 1315 | </source> |
1316 | <context-group purpose="location"> | 1316 | <context-group purpose="location"> |
@@ -5272,12 +5272,16 @@ When you will upload a video in this channel, the video support field will be au | |||
5272 | <context context-type="linenumber">1</context> | 5272 | <context context-type="linenumber">1</context> |
5273 | </context-group> | 5273 | </context-group> |
5274 | </trans-unit> | 5274 | </trans-unit> |
5275 | <trans-unit id="916a6e4fd83ece1dc54c6135eb3b8cd064b4bac3" datatype="html"> | 5275 | <trans-unit id="a4179e366d4aa335f1ddd0a13e9109c71a9338d0" datatype="html"> |
5276 | <source>Description cannot be more than 250 characters long.</source> | 5276 | <source>Description cannot be more than 1000 characters long.</source> |
5277 | <context-group purpose="location"> | 5277 | <context-group purpose="location"> |
5278 | <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context> | 5278 | <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context> |
5279 | <context context-type="linenumber">1</context> | 5279 | <context context-type="linenumber">1</context> |
5280 | </context-group> | 5280 | </context-group> |
5281 | <context-group purpose="location"> | ||
5282 | <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context> | ||
5283 | <context context-type="linenumber">1</context> | ||
5284 | </context-group> | ||
5281 | </trans-unit> | 5285 | </trans-unit> |
5282 | <trans-unit id="4a3ebc6ddb6b6677aed7b04eb503f9ddd0cfe561" datatype="html"> | 5286 | <trans-unit id="4a3ebc6ddb6b6677aed7b04eb503f9ddd0cfe561" datatype="html"> |
5283 | <source>You must to agree with the instance terms in order to registering on it.</source> | 5287 | <source>You must to agree with the instance terms in order to registering on it.</source> |
@@ -5419,13 +5423,6 @@ When you will upload a video in this channel, the video support field will be au | |||
5419 | <context context-type="linenumber">1</context> | 5423 | <context context-type="linenumber">1</context> |
5420 | </context-group> | 5424 | </context-group> |
5421 | </trans-unit> | 5425 | </trans-unit> |
5422 | <trans-unit id="fac936be125163a8494f3d7e7f21d65c7e4f1ff6" datatype="html"> | ||
5423 | <source>Description cannot be more than 500 characters long.</source> | ||
5424 | <context-group purpose="location"> | ||
5425 | <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context> | ||
5426 | <context context-type="linenumber">1</context> | ||
5427 | </context-group> | ||
5428 | </trans-unit> | ||
5429 | <trans-unit id="e7182e21e9566cc81c83f92727461322f71fd69b" datatype="html"> | 5426 | <trans-unit id="e7182e21e9566cc81c83f92727461322f71fd69b" datatype="html"> |
5430 | <source>Support text must be at least 3 characters long.</source> | 5427 | <source>Support text must be at least 3 characters long.</source> |
5431 | <context-group purpose="location"> | 5428 | <context-group purpose="location"> |
@@ -5433,8 +5430,8 @@ When you will upload a video in this channel, the video support field will be au | |||
5433 | <context context-type="linenumber">1</context> | 5430 | <context context-type="linenumber">1</context> |
5434 | </context-group> | 5431 | </context-group> |
5435 | </trans-unit> | 5432 | </trans-unit> |
5436 | <trans-unit id="3fe80c71378e127dda2dda9dbcd66b059d362813" datatype="html"> | 5433 | <trans-unit id="15ec53d9ee65cb930c5f5d10ae2e8dd3fd44fc85" datatype="html"> |
5437 | <source>Support text cannot be more than 500 characters long.</source> | 5434 | <source>Support text cannot be more than 1000 characters long.</source> |
5438 | <context-group purpose="location"> | 5435 | <context-group purpose="location"> |
5439 | <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context> | 5436 | <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context> |
5440 | <context context-type="linenumber">1</context> | 5437 | <context context-type="linenumber">1</context> |
@@ -5531,8 +5528,8 @@ When you will upload a video in this channel, the video support field will be au | |||
5531 | <context context-type="linenumber">1</context> | 5528 | <context context-type="linenumber">1</context> |
5532 | </context-group> | 5529 | </context-group> |
5533 | </trans-unit> | 5530 | </trans-unit> |
5534 | <trans-unit id="e61f1c05121fa5effa6ccddf5be6dcf1c822ff4b" datatype="html"> | 5531 | <trans-unit id="f17de746af56840511cae11559539b6d8b6955ad" datatype="html"> |
5535 | <source>Video support cannot be more than 500 characters long.</source> | 5532 | <source>Video support cannot be more than 1000 characters long.</source> |
5536 | <context-group purpose="location"> | 5533 | <context-group purpose="location"> |
5537 | <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context> | 5534 | <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context> |
5538 | <context context-type="linenumber">1</context> | 5535 | <context context-type="linenumber">1</context> |
diff --git a/server/helpers/peertube-crypto.ts b/server/helpers/peertube-crypto.ts index cb5f27240..8ef7b1359 100644 --- a/server/helpers/peertube-crypto.ts +++ b/server/helpers/peertube-crypto.ts | |||
@@ -62,10 +62,7 @@ function isJsonLDSignatureVerified (fromActor: ActorModel, signedDocument: any) | |||
62 | 62 | ||
63 | return jsig.promises | 63 | return jsig.promises |
64 | .verify(signedDocument, options) | 64 | .verify(signedDocument, options) |
65 | .then((result: { verified: boolean }) => { | 65 | .then((result: { verified: boolean }) => result.verified) |
66 | logger.info('coucou', result) | ||
67 | return result.verified | ||
68 | }) | ||
69 | .catch(err => { | 66 | .catch(err => { |
70 | logger.error('Cannot check signature.', { err }) | 67 | logger.error('Cannot check signature.', { err }) |
71 | return false | 68 | return false |