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

Fix: Microwave translation #703

Merged
merged 14 commits into from
Nov 27, 2023
Merged

Fix: Microwave translation #703

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
685e217
Перевод микроволновки в связи с переводом остальной кухни и небольшая…
MrRomainzZ Nov 15, 2023
863b90a
Merge branch 'translate' into translate_fix
MrRomainzZ Nov 15, 2023
37b57b4
Минус фикс string.js и плюс фикс datum/tgui
MrRomainzZ Nov 16, 2023
374fe3d
Merge branch 'translate' into translate_fix
MrRomainzZ Nov 16, 2023
eb8f7ff
Удаление джейсона и проверка на кириллицу
MrRomainzZ Nov 16, 2023
bf195ad
я сказал удаление джейсона
MrRomainzZ Nov 16, 2023
565e268
Revert "я сказал удаление джейсона"
MrRomainzZ Nov 16, 2023
6dbdf6f
а вот так?
MrRomainzZ Nov 16, 2023
0481fe5
а вот так? х2
MrRomainzZ Nov 16, 2023
0969b45
а вот так? х3
MrRomainzZ Nov 16, 2023
217496f
а вот так? х4
MrRomainzZ Nov 16, 2023
d862a8d
а вот так? х5
MrRomainzZ Nov 16, 2023
891367a
Small cleanup
MrRomainzZ Nov 17, 2023
050b2e0
Сносим изменения датума ТГУИ
MrRomainzZ Nov 27, 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
Next Next commit
Перевод микроволновки в связи с переводом остальной кухни и небольшая… 
… правка регулярного выражения у функции титульника окна TGUI для кириллицы
  • Loading branch information
@MrRomainzZ
MrRomainzZ committed Nov 15, 2023
commit 685e217794daac3f18aca9cc22ac5f63a6fcdc8b
4 changes: 2 additions & 2 deletions code/modules/food_and_drinks/kitchen_machinery/microwave.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/obj/machinery/kitchen_machine/microwave
name = "microwave"
desc = "A microwave, perfect for reheating things with radiation."
name = "микроволновка"
desc = "Микроволновка. Идеальна для перенагревания вещей излучением."
icon = 'icons/obj/kitchen.dmi'
icon_state = "mw"
cook_verbs = list("Microwaving", "Reheating", "Heating")
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/common/string.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export const toTitleCase = (str) => {
'To',
'With',
];
let currentStr = str.replace(/([^\W_]+[^\s-]*) */g, (str) => {
let currentStr = str.replace(/([A-Za-z0-9А-Яа-я]+[^\s-]*) */g, (str) => {
return str.charAt(0).toUpperCase() + str.substr(1).toLowerCase();
});
for (let word of WORDS_LOWER) {
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/public/tgui.bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading