From 06b6b49f43b967ac280eea03bb0d83e1decfffb5 Mon Sep 17 00:00:00 2001 From: profitroll Date: Fri, 17 Mar 2023 14:51:41 +0100 Subject: [PATCH] This commit closes #13 --- locale/en.json | 7 ++++++- locale/uk.json | 7 ++++++- plugins/callbacks/submission.py | 33 ++++++++++++++++++++++++++++----- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/locale/en.json b/locale/en.json index 6bb4bac..6be4d9c 100644 --- a/locale/en.json +++ b/locale/en.json @@ -100,6 +100,11 @@ "random_pic_error_debug": "Could not get photos from '{0}/albums/{1}/photos?q=&page_size={2}&caption=queue' using token '{3}': HTTP {4}", "find_pic_error": "Could not find image with name '{0}' and caption '{1}' due to: {2}", "pic_upload_error": "Could not upload '{0}' to API: HTTP {1} with message '{2}'", - "api_creds_invalid": "Incorrect API credentials! Could not login into '{0}' using login '{1}': HTTP {2}" + "api_creds_invalid": "Incorrect API credentials! Could not login into '{0}' using login '{1}': HTTP {2}", + "user_blocked": "User {0} has been blocked", + "user_unblocked": "User {0} has been unblocked", + "submission_accepted": "Submission with ID '{0}' accepted and uploaded with ID '{1}'", + "submission_rejected": "Submission with ID '{0}' rejected", + "submission_duplicate": "Submission with ID '{0}' could not be accepted because of the duplicates: {1}" } } \ No newline at end of file diff --git a/locale/uk.json b/locale/uk.json index d199753..2e88c54 100644 --- a/locale/uk.json +++ b/locale/uk.json @@ -100,6 +100,11 @@ "random_pic_error_debug": "Не вдалося отримати фотографії з '{0}/albums/{1}/photos?q=&page_size={2}&caption=queue', використовуючи токен '{3}': HTTP {4}", "find_pic_error": "Не вдалося знайти зображення з назвою '{0}' та підписом '{1}' через: {2}", "pic_upload_error": "Не вдалося завантажити '{0}' до API: HTTP {1} з повідомленням '{2}'", - "api_creds_invalid": "Невірні облікові дані API! Не вдалося увійти в '{0}' за допомогою логіна '{1}': HTTP {2}" + "api_creds_invalid": "Невірні облікові дані API! Не вдалося увійти в '{0}' за допомогою логіна '{1}': HTTP {2}", + "user_blocked": "Користувача {0} було заблоковано", + "user_unblocked": "Користувача {0} було розблоковано", + "submission_accepted": "Подання з ID '{0}' прийнято та завантажено з ID '{1}'", + "submission_rejected": "Подання з ID '{0}' відхилено", + "submission_duplicate": "Подання з ID '{0}' не може бути прийнято через наявність дублікатів: {1}" } } \ No newline at end of file diff --git a/plugins/callbacks/submission.py b/plugins/callbacks/submission.py index 7727f25..33178b1 100644 --- a/plugins/callbacks/submission.py +++ b/plugins/callbacks/submission.py @@ -40,7 +40,14 @@ async def callback_query_yes(app: PosterClient, clb: CallbackQuery): quote=True, ) logWrite( - f"Submission with ID '{fullclb[2]}' could not be accepted because of the duplicates: {str(exp.duplicates)}", + locale( + "submission_duplicate", + "console", + locale=configGet("locale_log").format( + fullclb[2], + str(exp.duplicates), + ), + ), debug=True, ) return @@ -89,7 +96,11 @@ async def callback_query_yes(app: PosterClient, clb: CallbackQuery): ) logWrite( - f"Submission with ID '{fullclb[2]}' accepted and uploaded with ID '{submission[1]}'", + locale( + "submission_accepted", + "console", + locale=configGet("locale_log").format(fullclb[2], submission[1]), + ), debug=True, ) @@ -184,7 +195,11 @@ async def callback_query_no(app: PosterClient, clb: CallbackQuery): reply_markup=InlineKeyboardMarkup(edited_markup) ) logWrite( - f"Submission with ID '{fullclb[2]}' rejected", + locale( + "submission_rejected", + "console", + locale=configGet("locale_log").format(fullclb[2]), + ), debug=True, ) @@ -215,7 +230,11 @@ async def callback_query_block(app: PosterClient, clb: CallbackQuery): reply_markup=InlineKeyboardMarkup(edited_markup) ) logWrite( - f"User {fullclb[2]} has been blocked", + locale( + "user_blocked", + "console", + locale=configGet("locale_log").format(fullclb[2]), + ), debug=True, ) @@ -246,6 +265,10 @@ async def callback_query_unblock(app: PosterClient, clb: CallbackQuery): reply_markup=InlineKeyboardMarkup(edited_markup) ) logWrite( - f"User {fullclb[2]} has been unblocked", + locale( + "user_unblocked", + "console", + locale=configGet("locale_log").format(fullclb[2]), + ), debug=True, )