Skip to content

Commit

Permalink
Improve translations a bit
Browse files Browse the repository at this point in the history
  • Loading branch information
@Steffo99
Steffo99 committed Feb 5, 2020
1 parent 985550e commit 63a28f2
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 76 deletions.
3 changes: 3 additions & 0 deletions config/template_config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ version = 14
; Set this to no when you are done editing the file
is_template = yes
; Language code for string file
; Available languages:
; it_IT - Italian, by Steffo
; en_US - English, by https://github.com/DarrenWestwood (incomplete, please improve it!)
language = it_IT

# Telegram bot parameters
Expand Down
139 changes: 68 additions & 71 deletions strings/en_US.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Strings / localization file for greed
# Can be edited, but DON'T REMOVE THE REPLACEMENT FIELDS (words surrounded by {curly braces})
# Current localization is Italian

# English translation by https://github.com/DarrenWestwood

# Currency symbol
currency_symbol = "€"
Expand All @@ -25,7 +26,7 @@

# Order info string, shown to the admins
order_format_string = "of {user}\n" \
"Created {date}\n" \
"Created on {date}\n" \
"\n" \
"{items}\n" \
"TOTAL: <b>{value}</b>\n" \
Expand All @@ -40,16 +41,16 @@
"Notes: {notes}\n"

# Transaction page is loading
loading_transactions = "<i>loading current transactions...\n" \
"Wait a few seconds, please</i>"
loading_transactions = "<i>Loading current transactions...\n" \
"Please wait for a few seconds...</i>"

# Transactions page
transactions_page = "Page <b>{page}</b>:\n" \
"\n" \
"{transactions}"

# transactions.csv caption
csv_caption = " a 📄 file was generated .csv containing all transactions stored in the bot database.\n" \
csv_caption = "A 📄 .csv file containing all transactions stored in the bot database was generated.\n" \
"You can open this file with other programs, such as LibreOffice Calc, to process" \
" data."

Expand All @@ -58,33 +59,33 @@
"Welcome to greed!\n" \
"What you see here is the 🅱️ <b>Beta</b> version of the software.\n" \
"It is fully usable, but it is possible that some bugs are still present.\n" \
"If you find any, you can collaborate with the developer to solve them, describing what it is" \
"success at https://github.com/Steffo99/greed/issues."
"If you find any, you can collaborate with the developer to solve them, describing what" \
" happened at https://github.com/Steffo99/greed/issues."

# Conversation: to send an inline keyboard you need to send a message with it
conversation_open_user_menu = "what would you like to do?\n" \
"💰 You have <b>{credit}</b> on your wallet\n" \
conversation_open_user_menu = "What would you like to do?\n" \
"💰 You have <b>{credit}</b> in your wallet.\n" \
"\n" \
"<i>to select an operation, Press a key on the keyboard at the bottom.\n" \
"<i>Press a key on the keyboard at the bottom to select an operation.\n" \
"If the keyboard has not opened, you can open it by pressing the button with four small squares" \
"in the message bar.</i>"
" in the message bar.</i>"

# Conversation: like above, but for administrators
conversation_open_admin_menu = "you are 💼 <b>Admin</b> manager of this store!\n" \
conversation_open_admin_menu = "You are 💼 <b>Admin</b> of this store!\n" \
"What would you like to do?\n" \
"\n" \
"<i>to select an operation, Press a key on the keyboard at the bottom.\n" \
"If the keyboard has not opened, you can open it by pressing the button with four small squares" \
"in the message bar.</i>"
" in the message bar.</i>"

# Conversation: select a payment method
conversation_payment_method = "how do you want to add funds to your wallet?"
conversation_payment_method = "How do you want to add funds to your wallet?"

# Conversation: select a product to edit
conversation_admin_select_product = "✏️ what product do you want to change?"
conversation_admin_select_product = "✏️ What product do you want to change?"

# Conversation: select a product to delete
conversation_admin_select_product_to_delete = "❌ what product do you want to delete?"
conversation_admin_select_product_to_delete = "❌ What product do you want to delete?"

# Conversation: select a user to edit
conversation_admin_select_user = " Select a user to perform the selected action on."
Expand All @@ -99,33 +100,32 @@
"{product_list}" \
"Total: <b>{total_cost}</b>\n" \
"\n" \
"<i>if you want to proceed, press the Done button below this message.\n" \
"<i>If you want to proceed, press the Done button below this message.\n" \
"To cancel, press the Cancel button.</i>"

# Conversation: the user activated the live orders mode
conversation_live_orders_start = "You are in <b>receiving order mode</b>\n" \
conversation_live_orders_start = "You are in <b>Live Orders</b> mode\n" \
"All new orders placed by customers will appear in real time in this" \
" chat, and you can mark them as ✅ completed" \
" or ✴️ refund the credit to the customer.\n" \
" chat, and you can mark them as ✅ Completed" \
" or ✴️ Refund the credit to the customer.\n" \
"\n" \
"<i>Press the Stop button below this message to stop the" \
" reception.</i>"

# Conversation: help menu has been opened
conversation_open_help_menu = "what kind of assistance do you want to receive?"
conversation_open_help_menu = "What kind of assistance do you want to receive?"

# Conversation: confirm promotion to admin
conversation_confirm_admin_promotion = "are you sure you want to promote this user to 💼 Admin manager?\n" \
conversation_confirm_admin_promotion = "Are you sure you want to promote this user to 💼 Admin?\n" \
"It is an irreversible action!"

# Conversation: switching to user mode
conversation_switch_to_user_mode = " You are switching to 👤 customer mode.\n" \
"If you want to summarize the role of 💼 Admin manager, restart the conversation with /start"
conversation_switch_to_user_mode = " You are switching to 👤 Customer mode.\n" \
"If you want to go back to the 💼 Admin menu, restart the conversation with /start."

# Notification: the conversation has expired
conversation_expired = "🕐 I haven't received any messages in a while, so to save energy" \
" I ended the conversation.\n" \
"If you want to start a new one, send the /start command again."
conversation_expired = "🕐 I haven't received any messages in a while, so I ended the conversation to save resources.\n" \
"If you want to start a new one, re-send the /start command."

# User menu: order
menu_order = "🛒 Orders"
Expand All @@ -137,13 +137,13 @@
menu_add_credit = "💵 Add funds"

# User menu: bot info
menu_bot_info = "ℹ️ Info about the bot"
menu_bot_info = "ℹ️ Bot info"

# User menu: cash
menu_cash = "💵 Cash"

# User menu: credit card
menu_credit_card = "💳 Credit card"
menu_credit_card = "💳 Credit Card"

# Admin menu: products
menu_products = "📝️ Products"
Expand Down Expand Up @@ -194,16 +194,16 @@
menu_remove_from_cart = "➖ Remove"

# Menu: help menu
menu_help = "❓ Help & support"
menu_help = "❓ Help / Support"

# Menu: guide
menu_guide = "📖 Guide"
menu_guide = "📖 Manual"

# Menu: next page
menu_next = "▶️ Next"

# Menu: previous page
menu_previous = "◀️ Back"
menu_previous = "◀️ Previous"

# Menu: contact the shopkeeper
menu_contact_shopkeeper = "👨‍💼 Contact the store"
Expand All @@ -212,7 +212,7 @@
menu_csv = "📄.csv"

# Menu: edit admins list
menu_edit_admins = "🏵 Edit handlers"
menu_edit_admins = "🏵 Edit admins"

# Emoji: unprocessed order
emoji_not_processed = "*️⃣"
Expand All @@ -230,7 +230,7 @@
emoji_no = "🚫"

# Text: unprocessed order
text_not_processed = " pending"
text_not_processed = "pending"

# Text: completed order
text_completed = "completed"
Expand All @@ -239,41 +239,41 @@
text_refunded = "refunded"

# Add product: name?
ask_product_name = " what should you call the product?"
ask_product_name = "What should be the product name?"

# Add product: description?
ask_product_description = " what should be the product description?"
ask_product_description = "What should be the product description?"

# Add product: price?
ask_product_price = " what should be the product price?\n" \
ask_product_price = "What should be the product price?\n" \
"Write <code>X</code> if you want the product not for sale yet"

# Add product: image?
ask_product_image = "🖼 what image do you want the product to have?\n" \
ask_product_image = "🖼 What image do you want the product to have?\n" \
"\n" \
"<i>send the photo, or if you prefer to leave the product without Picture press the Skip button here" \
" under.</i>"
"<i>Send the photo, or if you prefer to leave the product without any picture press the Skip " \
"button below.</i>"

# Order product: notes?
ask_order_notes = " want to leave a note along with the order?\n" \
"💼 Will be visible to store managers.\n" \
ask_order_notes = " Do you want to leave a note along with the order?\n" \
"💼 It will be visible to store admins.\n" \
"\n" \
"<i>send a message with the note you want to leave, or press the jump button below this" \
" message not to leave anything.</i>"
"<i>Send a message with the note you want to leave, or press the Skip button below this" \
" message to leave nothing.</i>"

# Refund product: reason?
ask_refund_reason = " attach a reason to this refund.\n" \
"👤 Will be visible to the customer."
ask_refund_reason = " Attach a reason to this refund.\n" \
"👤 It will be visible to the customer."

# Edit credit: notes?
ask_transaction_notes = " attach a note to this transaction.\n" \
"👤 Will be visible to the customer after crediting / debiting" \
" and 💼 Admin managers in the transaction log."
ask_transaction_notes = " Attach a note to this transaction.\n" \
"👤 It will be visible to the customer after crediting / debiting" \
" and to 💼 Admins in the transaction log."

# Edit credit: amount?
ask_credit = "How much do you want to change the customer's credit?\n" \
"\n" \
"<i>send a message containing the amount.\n" \
"<i>Send a message containing the amount.\n" \
"Put a mark </i><code>+</code><i> if you want to add credit to the customer's account." \
" or a sign </i><code>-</code><i> you want to deduce it.</i>"

Expand All @@ -298,14 +298,14 @@
"I will not be able to answer you while downloading."

# Edit product: current value
edit_current_value = "the current value is:\n" \
edit_current_value = "The current value is:\n" \
"<pre>{value}</pre>\n" \
"\n" \
"<i>Press the jump button below this message to keep the same value.</i>"

# Payment: cash payment info
payment_cash = "You can pay cash at the physical location of the store.\n" \
"Pay at checkout, and provide the store manager with this id:\n" \
"Pay at checkout, and provide the store admin with this id:\n" \
"<b>{user_cash_id}</b>"

# Payment: invoice amount
Expand All @@ -315,13 +315,10 @@
" normal.</i>"

# Payment: add funds invoice title
payment_invoice_title = " Adding funds"
payment_invoice_title = "Adding funds"

# Payment: add funds invoice description
payment_invoice_description = "Paying this receipt will add {amount} to the wallet.\n\n" \
"Since you are in the Alpha version of the software, you can make infinite payments" \
" with test credit card 4242 4242 4242 4242," \
" with any CVV and any valid expiration date."
payment_invoice_description = "Paying this receipt will add {amount} to your wallet."

# Payment: label of the labeled price on the invoice
payment_invoice_label = "Reload"
Expand All @@ -334,15 +331,15 @@
"{order}"

# Notification: order has been completed
notification_order_completed = "your order has been completed!\n" \
notification_order_completed = "Your order has been completed!\n" \
"{order}"

# Notification: order has been refunded
notification_order_refunded = "your order has been refunded!\n" \
notification_order_refunded = "Your order has been refunded!\n" \
"{order}"

# Notification: a manual transaction was applied
notification_transaction_created = "ℹ️ a new transaction has been applied to your wallet:\n" \
notification_transaction_created = "ℹ️ A new transaction has been applied to your wallet:\n" \
"{transaction}"

# Refund reason
Expand All @@ -351,10 +348,10 @@

# Info: informazioni sul bot
bot_info = ' This bot uses <a href="https://github.com/Steffo99/greed">greed</a>,' \
' a framework by @Steffo for payments on Telegram released below' \
' a framework by @Steffo for payments on Telegram released under the' \
' <a href="https://github.com/Steffo99/greed/blob/master/LICENSE.txt">' \
' General Public License 3.0</a>.\n' \
' The source code of this version is available <i>qui</i>.\n'
' Affero General Public License 3.0</a>.\n' \
' The source code of this version is available <i>here</i>.\n'

# Help: guide
help_msg = "Bot help is available at this address:\n" \
Expand All @@ -363,16 +360,16 @@
# Help: contact shopkeeper
contact_shopkeeper = "Currently, the staff available to provide user assistance is composed of:\n" \
"{shopkeepers}\n" \
"<i>Click / tap one of their names to contact them in a Telegram chat..</i>"
"<i>Click / Tap one of their names to contact them in a Telegram chat.</i>"

# Success: product has been added/edited to the database
success_product_edited = "✅ the product has been successfully added/modified!"
success_product_edited = "✅ The product has been successfully added/modified!"

# Success: product has been added/edited to the database
success_product_deleted = "✅ the product has been successfully deleted!"
success_product_deleted = "✅ The product has been successfully deleted!"

# Success: order has been created
success_order_created = "✅ the order was sent successfully!\n" \
success_order_created = "✅ The order was sent successfully!\n" \
"\n" \
"{order}"

Expand All @@ -383,7 +380,7 @@
success_order_refunded = "✴️ Order #{order_id} has been successfully refunded."

# Success: transaction was created successfully
success_transaction_created = "✅ the transaction was created successfully!\n" \
success_transaction_created = "✅ The transaction was created successfully!\n" \
"{transaction}"

# Error: message received not in a private chat
Expand Down Expand Up @@ -422,6 +419,6 @@
error_user_does_not_exist = "⚠️ The selected user does not exist"

# Fatal: conversation raised an exception
fatal_conversation_exception = "☢️ oh oh no! A <b>error</b> interrupted this conversation\n" \
"The error was reported to the developer of greed so that it can fix it.\n" \
"To start a new conversation, send the /start command."
fatal_conversation_exception = "☢️ Oh no! An <b>error</b> interrupted this conversation\n" \
"The error was reported to the developer of greed so that he can fix it.\n" \
"To restart the conversation, send the /start command."
5 changes: 1 addition & 4 deletions strings/it_IT.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,7 @@
payment_invoice_title = "Aggiunta di fondi"

# Payment: add funds invoice description
payment_invoice_description = "Pagando questa ricevuta verranno aggiunti {amount} al portafoglio.\n\n" \
"Visto che sei nella versione Alpha del software, puoi effettuare pagamenti infiniti" \
" con la carta di credito di prova 4242 4242 4242 4242," \
" con qualsiasi CVV e una qualsiasi data di scadenza valida."
payment_invoice_description = "Pagando questa ricevuta verranno aggiunti {amount} al portafoglio."

# Payment: label of the labeled price on the invoice
payment_invoice_label = "Ricarica"
Expand Down
6 changes: 5 additions & 1 deletion utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
import importlib

language = config["Config"]["language"]
strings = importlib.import_module("strings." + language)
try:
strings = importlib.import_module("strings." + language)
except ModuleNotFoundError:
print("The strings file you specified in the config file does not exist.")
sys.exit(1)

if config["Error Reporting"]["sentry_token"] != \
"https://00000000000000000000000000000000:00000000000000000000000000000000@sentry.io/0000000":
Expand Down

0 comments on commit 63a28f2

Please sign in to comment.