0
0
mirror of https://github.com/TrianguloY/UrlChecker.git synced 2024-09-19 20:02:16 +02:00

only show pending on unshorten result when half remains

This commit is contained in:
TrianguloY 2023-04-15 17:56:21 +02:00
parent 2eeff09694
commit a34381f83b
6 changed files with 23 additions and 12 deletions

View File

@ -143,7 +143,10 @@ class UnshortenDialog extends AModuleDialog {
} else if (Objects.equals(resolved_url, getUrl())) {
// same, nothing to replace
getActivity().runOnUiThread(() -> {
info.setText(getActivity().getString(R.string.mUnshort_notFound, ref.remaining_calls, ref.usage_limit));
var pending = ref.remaining_calls <= ref.usage_limit / 2
? " (" + getActivity().getString(R.string.mUnshort_pending, ref.remaining_calls, ref.usage_limit) + ")"
: "";
info.setText(getActivity().getString(R.string.mUnshort_notFound) + pending);
AndroidUtils.clearRoundedColor(info);
});
} else {
@ -151,7 +154,10 @@ class UnshortenDialog extends AModuleDialog {
getActivity().runOnUiThread(() -> {
setUrl(new UrlData(resolved_url).dontTriggerOwn());
info.setText(getActivity().getString(R.string.mUnshort_ok, ref.remaining_calls, ref.usage_limit));
var pending = ref.remaining_calls <= ref.usage_limit / 2
? " (" + getActivity().getString(R.string.mUnshort_pending, ref.remaining_calls, ref.usage_limit) + ")"
: "";
info.setText(getActivity().getString(R.string.mUnshort_ok) + pending);
AndroidUtils.setRoundedColor(R.color.good, info);
// a short url can redirect to another short url
unshort.setEnabled(true);

View File

@ -289,8 +289,9 @@ El servicio está limitado a 10 peticiones por hora para nuevos enlaces. La resp
<string name="mUnshort_checking">Comprobando…</string>
<string name="mUnshort_error">Error de servidor: %s</string>
<string name="mUnshort_internal">Error interno (%s)</string>
<string name="mUnshort_notFound">No se ha encontrado redirección (quedan: %d/%d)</string>
<string name="mUnshort_ok">Desacortado (quedan: %d/%d)</string>
<string name="mUnshort_notFound">No se ha encontrado redirección</string>
<string name="mUnshort_pending">quedan: %d/%d</string>
<string name="mUnshort_ok">Desacortado</string>
<!-- -->
<string name="mFlags_name">Editor de flags</string>
<string name="mFlags_invalid">Flag inválida</string>

View File

@ -292,6 +292,7 @@ Leur API est limitée à 10 requêtes par heure pour les nouveaux contrôles. L
<string name="mUnshort_checking">Vérification…</string>
<string name="mUnshort_error">Erreur de serveur: %s</string>
<string name="mUnshort_internal">Erreur interne (%s)</string>
<string name="mUnshort_notFound">"Aucune redirection n'a été trouvée (en attente: %d/%d)"</string>
<string name="mUnshort_ok">Déraccourci (en attente: %d/%d)</string>
<string name="mUnshort_notFound">"Aucune redirection n'a été trouvée"</string>
<string name="mUnshort_pending">en attente: %d/%d</string>
<string name="mUnshort_ok">Déraccourci</string>
</resources>

View File

@ -298,8 +298,9 @@ API'leri, yeni kontroller için saatte 10 istek ile sınırlıdır. Modül yanı
<string name="mUnshort_checking">Kontrol ediliyor…</string>
<string name="mUnshort_error">Sunucu hatası: %s</string>
<string name="mUnshort_internal">Internal error (%s)</string>
<string name="mUnshort_notFound">Yönlendirme bulunamadı (beklemede: %d/%d)</string>
<string name="mUnshort_ok">Kısaltma giderildi (beklemede: %d/%d)</string>
<string name="mUnshort_notFound">Yönlendirme bulunamadı</string>
<string name="mUnshort_pending">beklemede: %d/%d</string>
<string name="mUnshort_ok">Kısaltma giderildi</string>
<!-- -->
<string name="mFlags_name">İşaretler düzenleyici</string>
<string name="mFlags_invalid">Geçersiz işaret</string>

View File

@ -264,6 +264,7 @@
<string name="mUnshort_checking">检查中</string>
<string name="mUnshort_error">服务器错误: %s</string>
<string name="mUnshort_internal">内部错误 (%s)</string>
<string name="mUnshort_notFound">未发现重定向 (待处理: %d/%d)</string>
<string name="mUnshort_ok">已解析短链接 (待处理: %d/%d)</string>
<string name="mUnshort_notFound">未发现重定向</string>
<string name="mUnshort_pending">待处理: %d/%d</string>
<string name="mUnshort_ok">已解析短链接</string>
</resources>

View File

@ -297,8 +297,9 @@ Their api is rate limited to 10 requests per hour for new checks. The module res
<string name="mUnshort_checking">Checking…</string>
<string name="mUnshort_error">Server error: %s</string>
<string name="mUnshort_internal">Internal error (%s)</string>
<string name="mUnshort_notFound">No redirection found (pending: %d/%d)</string>
<string name="mUnshort_ok">Unshorted (pending: %d/%d)</string>
<string name="mUnshort_notFound">No redirection found</string>
<string name="mUnshort_pending">pending: %d/%d</string>
<string name="mUnshort_ok">Unshorted</string>
<!-- -->
<string name="mFlags_name">Flags editor</string>
<string name="mFlags_invalid">Invalid flag</string>