Skip to content
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

qol: Interface Translation #6188

Draft
wants to merge 9 commits into
base: master220
Choose a base branch
from
Draft

qol: Interface Translation #6188

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
816cb0a
Interface translation
Insurgent679 Nov 16, 2024
f84e363
craft translate
Insurgent679 Nov 16, 2024
9b9c922
name return
Insurgent679 Nov 16, 2024
a991274
Wiki change
Insurgent679 Nov 17, 2024
56bbb23
Фикс косяка
Insurgent679 Nov 17, 2024
5d5db97
fix craft.dm
Insurgent679 Nov 17, 2024
d366dbf
Update guncrafting.dm
Insurgent679 Nov 17, 2024
6547807
Update skin.dmf
Insurgent679 Nov 17, 2024
2f93b53
Update craft.dm 2
Insurgent679 Nov 17, 2024
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
32 changes: 16 additions & 16 deletions code/modules/crafting/craft.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,26 +149,26 @@
var/list/contents = get_surroundings(user)
var/send_feedback = 1
if(!check_contents(R, contents))
return ", missing component."
return ", недостающий компонент."
if(!check_tools(user, R, contents))
return ", missing tool."
return ", недостающий инструмент."
if(!check_pathtools(user, R, contents))
return ", missing tool."
return ", недостающий инструмент."

if(!do_after(user, R.time, user))
return "."
contents = get_surroundings(user)

if(!check_contents(R, contents))
return ", missing component."
return ", недостающий компонент."
if(!check_tools(user, R, contents))
return ", missing tool."
return ", недостающий инструмент."
if(!check_pathtools(user, R, contents))
return ", missing tool."
return ", недостающий инструмент."

var/list/parts = requirements_deletion(R, user)
if(!parts)
return ", missing component."
return ", недостающий компонент."

var/result_list = R.result
if(!islist(result_list))
Expand Down Expand Up @@ -220,7 +220,7 @@
break

if(needed_amount > 0)
stack_trace("While crafting [recipe], some of [thing] went missing (still need [needed_amount])!")
stack_trace("Во время крафта [recipe], некоторые из [thing] пропали без вести (Нужно ещё [needed_amount])!")
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
continue // ignore the error, and continue crafting for player's benefit

else if(ispath(thing, /obj/item/stack))
Expand All @@ -242,14 +242,14 @@
break

if(needed_amount > 0)
stack_trace("While crafting [recipe], some of [thing] went missing (still need [needed_amount])!")
stack_trace("Во время крафта [recipe], некоторые из [thing] пропали без вести (Нужно ещё [needed_amount])!")
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
continue

else
for(var/i in 1 to needed_amount)
var/atom/movable/part_atom = locate(thing) in (surroundings - parts_used)
if(!part_atom)
stack_trace("While crafting [recipe], the [thing] went missing!")
stack_trace("Во время крафта [recipe], [thing] пропали без вести!")
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
continue
parts_used += part_atom

Expand All @@ -275,7 +275,7 @@
for(var/i in 1 to recipe.parts[part_path])
var/part = locate(part_path) in parts_used
if(!part)
stack_trace("Part [part_path] went missing")
stack_trace("части [part_path] пропали без вести")
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
parts_returned += part
parts_used -= part
QDEL_LIST(parts_used)
Expand All @@ -288,11 +288,11 @@
/datum/personal_crafting/ui_interact(mob/user, datum/tgui/ui = null)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "PersonalCrafting", "Crafting Menu")
ui = new(user, src, "Персональный крафт", "Меню для крафта")
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
ui.open()

/datum/personal_crafting/proc/close(mob/user)
var/datum/tgui/ui = SStgui.get_open_ui(user, src, "main")
var/datum/tgui/ui = SStgui.get_open_ui(user, src, "Главное")
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
if(ui)
ui.close()

Expand Down Expand Up @@ -344,8 +344,8 @@
. = TRUE

switch(action)
if("make")
var/datum/crafting_recipe/TR = locate(params["make"]) in GLOB.crafting_recipes
if("Создать")
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
var/datum/crafting_recipe/TR = locate(params["Создать"]) in GLOB.crafting_recipes
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
if(!istype(TR))
return
busy = TRUE
Expand All @@ -356,7 +356,7 @@
if(TR.alert_admins_on_craft)
message_admins("[key_name_admin(usr)] has created a [TR.name] at [ADMIN_COORDJMP(usr)]")
else
to_chat(usr, "<span class='warning'>Construction failed[fail_msg]</span>")
to_chat(usr, "<span class='warning'>Строительство провалилось[fail_msg]</span>")
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
busy = FALSE
SStgui.update_uis(src)

Expand Down
22 changes: 11 additions & 11 deletions code/modules/crafting/guncrafting.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@

/obj/item/weaponcrafting/receiver
name = "modular receiver"
desc = "A prototype modular receiver and trigger assembly for a firearm."
desc = "Прототип модульной ствольной коробки и спускового механизма для огнестрельного оружия."
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
icon = 'icons/obj/improvised.dmi'
icon_state = "receiver"

/obj/item/weaponcrafting/stock
name = "rifle stock"
desc = "A classic rifle stock that doubles as a grip, roughly carved out of wood."
desc = "Классический приклад винтовки, который одновременно служит рукояткой, грубо вырезан из дерева."
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
icon = 'icons/obj/improvised.dmi'
icon_state = "riflestock"

/obj/item/weaponcrafting/revolverbarrel
name = "improvised revolver barrel"
desc = "A roughly made revolver barrel."
desc = "Грубо сделанный револьверный ствол."
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
icon = 'icons/obj/improvised.dmi'
icon_state = "rev_barrel"
w_class = WEIGHT_CLASS_SMALL
var/new_fire_sound = 'sound/weapons/gunshots/1rev257.ogg'

/obj/item/weaponcrafting/revolverbarrel/steel
name = "steel revolver barrel"
desc = "High quality heavy steel gun barrel to increase stability."
desc = "Ствол пистолета из высококачественной тяжелой стали для повышения устойчивости."
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
icon = 'icons/obj/improvised.dmi'
icon_state = "s_rev_barrel"
new_fire_sound = 'sound/weapons/gunshots/1rev257S.ogg'
Expand All @@ -40,7 +40,7 @@
if(!user.drop_transfer_item_to_loc(I, src))
return ..()
add_fingerprint(user)
to_chat(user, "You attach the shotgun barrel to the receiver. The pins seem loose.")
to_chat(user, "Вы прикрепляете ствол дробовика к ствольной коробке. Кажется, что штифты ослаблены.")
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
var/obj/item/weaponcrafting/ishotgunconstruction/construct = new(drop_location())
transfer_fingerprints_to(construct)
I.transfer_fingerprints_to(construct)
Expand All @@ -58,7 +58,7 @@

/obj/item/weaponcrafting/ishotgunconstruction
name = "slightly conspicuous metal construction"
desc = "A long pipe attached to a firearm receiver. The pins seem loose."
desc = "Длинная труба, прикрепленная к ствольной коробке огнестрельного оружия. Кажется, что штифты расшатаны."
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
icon = 'icons/obj/improvised.dmi'
icon_state = "ishotgunstep1"

Expand All @@ -72,13 +72,13 @@
construct.add_fingerprint(user)
user.temporarily_remove_item_from_inventory(src, force = TRUE)
user.put_in_hands(construct, ignore_anim = FALSE)
to_chat(user, span_notice("You screw the pins into place, securing the pipe to the receiver."))
to_chat(user, span_notice("Вы вкручиваете штифты на место, закрепляя трубу на приемнике."))
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
pilygun marked this conversation as resolved.
Show resolved Hide resolved
qdel(src)


/obj/item/weaponcrafting/ishotgunconstruction2
name = "very conspicuous metal construction"
desc = "A long pipe attached to a trigger assembly."
desc = "Длинная труба, прикрепленная к спусковому механизму."
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
icon = 'icons/obj/improvised.dmi'
icon_state = "ishotgunstep1"

Expand Down Expand Up @@ -106,7 +106,7 @@

/obj/item/weaponcrafting/ishotgunconstruction3
name = "extremely conspicuous metal construction"
desc = "A receiver-barrel shotgun assembly with a loose wooden stock. There's no way you can fire it without the stock coming loose."
desc = "Дробовик в сборе со ствольной коробкой и незакрепленным деревянным прикладом. Вы не сможете выстрелить из него без того, чтобы приклад не отвалился."
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
icon = 'icons/obj/improvised.dmi'
icon_state = "ishotgunstep2"

Expand All @@ -118,9 +118,9 @@
if(loc == user && !user.can_unEquip(src))
return ..()
if(!wrap.use(5))
to_chat(user, span_warning("You need at least five feet of wrapping paper to secure the stock."))
to_chat(user, span_warning("Вам понадобится не менее пяти футов оберточной бумаги, чтобы закрепить заготовку."))
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
return ATTACK_CHAIN_PROCEED
to_chat(user, span_notice("You tie the wrapping paper around the stock and the barrel to secure it."))
to_chat(user, span_notice("Вы обвязываете оберточной бумагой приклад и ствол, чтобы закрепить его."))
Insurgent679 marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

балун и тучат

var/obj/item/gun/projectile/revolver/doublebarrel/improvised/shotta = new(drop_location())
transfer_fingerprints_to(shotta)
shotta.add_fingerprint(user)
Expand Down
40 changes: 20 additions & 20 deletions interface/interface.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,76 @@
//Please use mob or src (not usr) in these procs. This way they can be called in the same fashion as procs.
/client/verb/wiki()
set name = "wiki"
set desc = "Type what you want to know about. This will open the wiki in your web browser."
set desc = "Введите то, о чем вы хотите знать. После этого в вашем веб-браузере откроется вики-страница."
set hidden = 1
if(CONFIG_GET(string/wikiurl))
var/query = tgui_input_text(src, "Enter Search:", "Wiki Search", "Homepage")
if(query == "Homepage")
var/query = tgui_input_text(src, "Введите запрос:", "Поиск по вики-сайту", "Заглавная страница")
if(query == "Заглавная страница")
src << link(CONFIG_GET(string/wikiurl))
else if(query)
var/output = CONFIG_GET(string/wikiurl) + "/index.php?title=Special%3ASearch&profile=default&search=" + query
src << link(output)
else
to_chat(src, "<span class='danger'>The wiki URL is not set in the server configuration.</span>")
to_chat(src, "<span class='danger'>URL-адрес wiki не задан в конфигурации сервера.</span>")
return

/client/verb/forum()
set name = "forum"
set desc = "Visit the forum."
set desc = "Посетите форум."
set hidden = 1
if(CONFIG_GET(string/forumurl))
if(tgui_alert(src, "Open the forum in your browser?", "Forum", list("Yes", "No")) != "Yes")
if(tgui_alert(src, "Откройте форум в своем браузере?", "Forum", list("Да", "Нет")) != "Да")
return
if(CONFIG_GET(string/forum_link_url) && prefs && !prefs.fuid)
link_forum_account()
src << link(CONFIG_GET(string/forumurl))
else
to_chat(src, "<span class='danger'>The forum URL is not set in the server configuration.</span>")
to_chat(src, "<span class='danger'>URL-адрес форума не задан в конфигурации сервера.</span>")

/client/verb/rules()
set name = "Rules"
set desc = "View the server rules."
set name = "Правила"
set desc = "Просмотрите правила сервера."
set hidden = 1
if(CONFIG_GET(string/rulesurl))
if(tgui_alert(src, "This will open the rules in your browser. Are you sure?", "Rules", list("Yes", "No")) != "Yes")
if(tgui_alert(src, "После этого в вашем браузере откроются правила. Вы уверены?", "Правила", list("Да", "Нет")) != "Да")
return
src << link(CONFIG_GET(string/rulesurl))
else
to_chat(src, "<span class='danger'>The rules URL is not set in the server configuration.</span>")
to_chat(src, "<span class='danger'>URL-адрес правил не задан в конфигурации сервера.</span>")

/client/verb/github()
set name = "GitHub"
set desc = "Visit the GitHub page."
set desc = "Посетите страницу на GitHub."
set hidden = 1
if(CONFIG_GET(string/githuburl))
if(tgui_alert(src, "This will open our GitHub repository in your browser. Are you sure?", "GitHub", list("Yes", "No")) != "Yes")
if(tgui_alert(src, "Это откроет наш репозиторий на GitHub в вашем браузере. Вы уверены?", "GitHub", list("Да", "Нет")) != "Да")
return
src << link(CONFIG_GET(string/githuburl))
else
to_chat(src, "<span class='danger'>The GitHub URL is not set in the server configuration.</span>")
to_chat(src, "<span class='danger'>URL-адрес GitHub не задан в конфигурации сервера.</span>")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

span_danger()


/client/verb/discord()
set name = "Discord"
set desc = "Join our Discord server."
set desc = "Присоединяйтесь к нашему серверу Discord."
set hidden = 1

var/durl = CONFIG_GET(string/discordurl)
if(CONFIG_GET(string/forum_link_url) && prefs && prefs.fuid && CONFIG_GET(string/discordforumurl))
durl = CONFIG_GET(string/discordforumurl)
if(!durl)
to_chat(src, "<span class='danger'>The Discord URL is not set in the server configuration.</span>")
to_chat(src, "<span class='danger'>URL-адрес Discord не задан в конфигурации сервера.</span>")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

span_danger()

return
if(tgui_alert(src, "This will invite you to our Discord server. Are you sure?", "Discord", list("Yes", "No")) != "Yes")
if(tgui_alert(src, "Это пригласит вас на наш сервер Discord. Вы уверены?", "Discord", list("Да", "Нет")) != "Да")
return
src << link(durl)

/client/verb/donate()
set name = "Donate"
set desc = "Donate to help with hosting costs."
set desc = "Сделайте пожертвование, чтобы покрыть расходы на хостинг."
set hidden = 1
if(CONFIG_GET(string/donationsurl))
if(tgui_alert(src, "This will open the donation page in your browser. Are you sure?", "Donate", list("Yes", "No")) != "Yes")
if(tgui_alert(src, "После этого в вашем браузере откроется страница пожертвований. Вы уверены?", "Donate", list("Да", "Нет")) != "Да")
return
src << link(CONFIG_GET(string/donationsurl))
else
to_chat(src, "<span class='danger'>The rules URL is not set in the server configuration.</span>")
to_chat(src, "<span class='danger'>URL-адрес донатов не задан в конфигурации сервера.</span>")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

span_danger()

Loading
Loading