Skip to content

[stable26] fix(translation): Fix several issues with the translations api #37705

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.

Sign up for GitHub

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

Merged
skjnldsv merged 4 commits into from
Apr 13, 2023
Merged

[stable26] fix(translation): Fix several issues with the translations api #37705

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9cb759
fix(translation): Translate error messages on translations API
nickvergessen Apr 13, 2023
98e90eb
fix(translation): Properly set the numbers as HTTP status code
nickvergessen Apr 13, 2023
5a502c6
fix(translation): Use 400 as status code to be distinguishable from s…
nickvergessen Apr 13, 2023
35b0834
feat(translation): Allow guests to use translations as well
nickvergessen Apr 13, 2023
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
22 changes: 16 additions & 6 deletions core/Controller/TranslationApiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,30 @@
use InvalidArgumentException;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\IL10N;
use OCP\IRequest;
use OCP\PreConditionNotMetException;
use OCP\Translation\ITranslationManager;
use RuntimeException;

class TranslationApiController extends \OCP\AppFramework\OCSController {
private ITranslationManager $translationManager;
private IL10N $l;

public function __construct($appName, IRequest $request, ITranslationManager $translationManager) {
public function __construct(
string $appName,
IRequest $request,
ITranslationManager $translationManager,
IL10N $l,
) {
parent::__construct($appName, $request);

$this->translationManager = $translationManager;
$this->l = $l;
}

/**
* @NoAdminRequired
* @PublicPage
*/
public function languages(): DataResponse {
return new DataResponse([
Expand All @@ -54,19 +62,21 @@ public function languages(): DataResponse {
}

/**
* @NoAdminRequired
* @PublicPage
* @UserRateThrottle(limit=25, period=120)
* @AnonRateThrottle(limit=10, period=120)
*/
public function translate(string $text, ?string $fromLanguage, string $toLanguage): DataResponse {
try {
return new DataResponse([
'text' => $this->translationManager->translate($text, $fromLanguage, $toLanguage)
]);
} catch (PreConditionNotMetException) {
return new DataResponse(['message' => 'No translation provider available'], Http::STATUS_PRECONDITION_FAILED);
return new DataResponse(['message' => $this->l->t('No translation provider available')], Http::STATUS_PRECONDITION_FAILED);
} catch (InvalidArgumentException) {
return new DataResponse(['message' => 'Could not detect language', Http::STATUS_NOT_FOUND]);
return new DataResponse(['message' => $this->l->t('Could not detect language')], Http::STATUS_BAD_REQUEST);
} catch (RuntimeException) {
return new DataResponse(['message' => 'Unable to translate', Http::STATUS_INTERNAL_SERVER_ERROR]);
return new DataResponse(['message' => $this->l->t('Unable to translate')], Http::STATUS_BAD_REQUEST);
}
}
}