Фикс всей локализации

.github/workflows/validate-locale.yml

@@ -4,7 +4,9 @@ on:
   push:
     branches: [ staging, trying ]
   pull_request:
-    types: [ opened, reopened, synchronize, ready_for_review ]
+    paths:
+      - '**.yml'
+      - '**.ftl'
 
 jobs:
   validate_ymls:
@@ -21,4 +23,4 @@ jobs:
           pip install --no-cache-dir PyYAML
       - name: Validate Locales
         run: |
-          python3 Tools/_sunrise/Schemas/validate_yml.py Resources/Prototypes/
+          python3 Tools/_sunrise/Schemas/validate_yml.py Resources/Locale/ Resources/Prototypes/ --ignore Tools/_sunrise/Schemas/ignore_list.yml

.github/workflows/validate-rsis.yml

@@ -14,6 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
       - name: Install Python dependencies
         run: |
           pip3 install --ignore-installed --user pillow jsonschema

Content.Client/_Sunrise/Roadmap/Roadmap.xaml.cs

@@ -55,8 +55,8 @@ private void PopulateRoadmap(RoadmapVersionsPrototype roadmapVersions)
                 {
                     var roadmapItem = new RoadmapItem()
                     {
-                        HeaderText = goal.Value.Name,
-                        Text = goal.Value.Desc,
+                        HeaderText = Loc.TryGetString($"{goal.Value.Id}-name", out var name) ? name : goal.Value.Name,
+                        Text = Loc.TryGetString($"{goal.Value.Id}-desc", out var desc) ? desc : goal.Value.Desc,
                         ItemState = goal.Value.State,
                     };
 

Content.Shared/Cargo/Prototypes/CargoProductPrototype.cs

@@ -38,7 +38,7 @@ public string Name
 
                 if (IoCManager.Resolve<IPrototypeManager>().TryIndex(Product, out EntityPrototype? prototype))
                 {
-                    _name = prototype.Name;
+                    _name = Loc.TryGetString($"{prototype.ID}-name", out var name) ? name : prototype.Name; //Sunrise-edit: Localization
                 }
 
                 return _name;
@@ -58,7 +58,7 @@ public string Description
 
                 if (IoCManager.Resolve<IPrototypeManager>().TryIndex(Product, out EntityPrototype? prototype))
                 {
-                    _description = prototype.Description;
+                    _description = Loc.TryGetString($"{prototype.ID}-desc", out var desc) ? desc : prototype.Description; //Sunrise-edit: Localization
                 }
 
                 return _description;

Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs

@@ -39,35 +39,15 @@ public override ConstructionGuideEntry GenerateGuideEntry()
                 {
                     if (item.TryGetComponent<TagComponent>(out var entityTag) && entityManager.System<TagSystem>().HasTag(entityTag, Tag))
                     {
-                        //Sunrise-start
-                        if(item.Name == "левая рука киборга-официанта")
-                        {
-                            nameLocale = "левая рука киборга";
-                        }
-                        else if(item.Name == "голова киборга-уборщика")
-                        {
-                            nameLocale = "голова киборга";
-                        }
-                        else
-                        {
-                            nameLocale = item.Name;
-                        }
-                        //Sunrise-End
+                        nameLocale = item.Name;
                         break;
                     }
                 }
             }
-
-            if (nameLocale == null)
-            {
-                var formattedName = Name.Replace(" ", "-").ToLower();
-                nameLocale = Loc.GetString($"material-{formattedName}-name");
-            }
-
             return new ConstructionGuideEntry
             {
                 Localization = "construction-presenter-arbitrary-step",
-                Arguments = new (string, object)[] { ("name", nameLocale ?? Name) },
+                Arguments = new (string, object)[] { ("name", Loc.TryGetString($"{Name}", out var translatedname) ? translatedname : nameLocale ?? Name) },
                 Icon = Icon,
             };
         }

Content.Shared/_Sunrise/Roadmap/RoadmapVersionsPrototype.cs

@@ -29,6 +29,9 @@ public sealed partial class RoadmapGroup
 [Serializable, NetSerializable]
 public sealed partial class RoadmapGoal
 {
+    [DataField]
+    public string Id { get; set; } = string.Empty; //Хуйня нужная для локализации, не трогать
+
     [DataField]
     public string Name { get; set; } = string.Empty;
 

Resources/Locale/en-US/_prototypes/_sunrise/actions/smile_actions.ftl

@@ -1,2 +1,2 @@
-ent-SmileAffection = Обнимашки
-    .desc = Смайл обнимается с целью, восстанавливая ей некоторое количество здоровья.
+ent-SmileAffection = Hugs
+    .desc = Smile hugs the target, restoring a certain amount of health to it.

Resources/Locale/en-US/_prototypes/_sunrise/actions/sniper_zoom.ftl

@@ -1,2 +1,2 @@
-ent-ActionTakeAim = Включить прицеливание
+ent-ActionTakeAim = Activate aiming
     .desc = { "" }

Resources/Locale/en-US/_prototypes/_sunrise/body/organs/humanoid_xeno.ftl

@@ -2,21 +2,21 @@ ent-BaseHumanoidXenoOrganUnGibbable = { ent-BaseItem }
     .desc = { ent-BaseItem.desc }
 ent-BaseHumanoidXenoOrgan = { ent-BaseHumanoidXenoOrganUnGibbable }
     .desc = { ent-BaseHumanoidXenoOrganUnGibbable.desc }
-ent-OrganHumanoidXenoBrain = мозг
-    .desc = Нексус чужеродного разума. Мысли, которых вы не хотите знать.
-ent-OrganHumanoidXenoTongue = язык
-    .desc = Длинный и гибкий.
-ent-OrganHumanoidXenoAppendix = аппендикс
-    .desc = Эволюционный привет из прошлого.
-ent-OrganHumanoidXenoEars = уши
-    .desc = Сверхчувствительные локаторы. Слышат ваши страхи.
-ent-OrganHumanoidXenoLungs = легкие
-    .desc = Фильтруют кислород из атмосферы и направляют его в кровь, где он используется как переносчик электронов.
-ent-OrganHumanoidXenoHeart = сердце ксеноморфа
-    .desc = Мощный орган, перекачивающий кислую кровь сквозь жесткие ткани и обеспечивающий невероятную выносливость и силу каждому ксеноморфу.
-ent-OrganHumanoidXenoStomach = желудок
-    .desc = Прожорливая яма.
-ent-OrganHumanoidXenoLiver = печень
-    .desc = Мощный детоксикатор, с легкостью нейтрализующий опасные вещества.
-ent-OrganHumanoidXenoKidneys = почки
-    .desc = Парные фильтры, безжалостно выводящие всё лишнее.
+ent-OrganHumanoidXenoBrain = brain
+    .desc = The nexus of the alien mind. Thoughts you don't want to know.
+ent-OrganHumanoidXenoTongue = tongue
+    .desc = Long and flexible.
+ent-OrganHumanoidXenoAppendix = appendix
+    .desc = An evolutionary greeting from the past.
+ent-OrganHumanoidXenoEars = ears
+    .desc = Ultra-sensitive locators. Hear your fears.
+ent-OrganHumanoidXenoLungs = lungs
+    .desc = They filter oxygen from the atmosphere and channel it into the bloodstream, where it is used as an electron carrier.
+ent-OrganHumanoidXenoHeart = xenomorph heart
+    .desc = A powerful organ that pumps acidic blood through tough tissues and provides incredible stamina and strength to every xenomorph.
+ent-OrganHumanoidXenoStomach = stomach
+    .desc = A voracious pit.
+ent-OrganHumanoidXenoLiver = liver
+    .desc = A powerful detoxifier that neutralizes dangerous substances with ease.
+ent-OrganHumanoidXenoKidneys = kidneys
+    .desc = Paired filters, ruthlessly taking out anything superfluous.

Resources/Locale/en-US/_prototypes/_sunrise/body/organs/predator.ftl

@@ -2,23 +2,23 @@ ent-BasePredatorOrganUnGibbable = { ent-BaseItem }
     .desc = { ent-BaseItem.desc }
 ent-BasePredatorOrgan = { ent-BasePredatorOrganUnGibbable }
     .desc = { ent-BasePredatorOrganUnGibbable.desc }
-ent-OrganPredatorBrain = мозг
-    .desc = Нексус чужеродного разума. Мысли, которых вы не хотите знать.
-ent-OrganPredatorTongue = язык
-    .desc = Длинный и гибкий.
-ent-OrganPredatorAppendix = аппендикс
-    .desc = Эволюционный привет из прошлого.
-ent-OrganPredatorEars = уши
-    .desc = Сверхчувствительные локаторы. Слышат ваши страхи.
-ent-OrganPredatorLungs = легкие
-    .desc = Фильтруют кислород из атмосферы и направляют его в кровь, где он используется как переносчик электронов.
-ent-OrganPredatorHeart = сердце яутжи
-    .desc = Мощный орган, перекачивающий кислую кровь сквозь жесткие ткани и обеспечивающий невероятную выносливость и силу каждому яутже.
-ent-OrganPredatorStomach = желудок
-    .desc = Прожорливая яма.
-ent-OrganPredatorLiver = печень
-    .desc = Мощный детоксикатор, с легкостью нейтрализующий опасные вещества.
-ent-OrganPredatorKidneys = почки
-    .desc = Парные фильтры, безжалостно выводящие всё лишнее.
-ent-OrganPredatorEyes = глаза
-    .desc = Я тебя вижу!
+ent-OrganPredatorBrain = brain
+    .desc = The nexus of the alien mind. Thoughts you don't want to know.
+ent-OrganPredatorTongue = tongue
+    .desc = Long and flexible.
+ent-OrganPredatorAppendix = appendix
+    .desc = An evolutionary greeting from the past.
+ent-OrganPredatorEars = ears
+    .desc = Ultra-sensitive locators. Hear your fears.
+ent-OrganPredatorLungs = lungs
+    .desc = They filter oxygen from the atmosphere and channel it into the bloodstream, where it is used as an electron carrier.
+ent-OrganPredatorHeart = predator heart
+    .desc = A powerful organ that pumps acidic blood through tough tissues and provides incredible stamina and strength to every predator.
+ent-OrganPredatorStomach = stomach
+    .desc = A voracious pit.
+ent-OrganPredatorLiver = liver
+    .desc = A powerful detoxifier that neutralizes dangerous substances with ease.
+ent-OrganPredatorKidneys = kidneys
+    .desc = Paired filters, ruthlessly taking out anything superfluous.
+ent-OrganPredatorEyes = eyes
+    .desc = I see YOU!

Resources/Locale/en-US/_prototypes/_sunrise/body/parts/humanoid_xeno.ftl

@@ -1,22 +1,22 @@
-ent-PartHumanoidXeno = правая рука ксеноморфа
+ent-PartHumanoidXeno = xenomorph body part
     .desc = { ent-BaseItem.desc }
-ent-TorsoHumanoidXeno = торс ксеноморфа
+ent-TorsoHumanoidXeno = xenomorph torso
     .desc = { ent-PartHumanoidXeno.desc }
-ent-HeadHumanoidXeno = голова ксеноморфа
+ent-HeadHumanoidXeno = xenomorph head
     .desc = { ent-PartHumanoidXeno.desc }
-ent-LeftArmHumanoidXeno = левая рука ксеноморфа
+ent-LeftArmHumanoidXeno = left xenomorph arm
     .desc = { ent-PartHumanoidXeno.desc }
-ent-RightArmHumanoidXeno = правая рука ксеноморфа
+ent-RightArmHumanoidXeno = right xenomorph arm
     .desc = { ent-PartHumanoidXeno.desc }
-ent-LeftHandHumanoidXeno = левая кисть ксеноморфа
+ent-LeftHandHumanoidXeno = left xenomorph hand
     .desc = { ent-PartHumanoidXeno.desc }
-ent-RightHandHumanoidXeno = правая кисть ксеноморфа
+ent-RightHandHumanoidXeno = right xenomorph hand
     .desc = { ent-PartHumanoidXeno.desc }
-ent-LeftLegHumanoidXeno = левая нога ксеноморфа
+ent-LeftLegHumanoidXeno = left xenomorph leg
     .desc = { ent-PartHumanoidXeno.desc }
-ent-RightLegHumanoidXeno = правая нога ксеноморфа
+ent-RightLegHumanoidXeno = right xenomorph leg
     .desc = { ent-PartHumanoidXeno.desc }
-ent-LeftFootHumanoidXeno = левая стопа ксеноморфа
+ent-LeftFootHumanoidXeno = left xenomorph foot
     .desc = { ent-PartHumanoidXeno.desc }
-ent-RightFootHumanoidXeno = правая стопа ксеноморфа
+ent-RightFootHumanoidXeno = right xenomorph foot
     .desc = { ent-PartHumanoidXeno.desc }

Resources/Locale/en-US/_prototypes/_sunrise/body/parts/predator.ftl

@@ -1,22 +1,22 @@
-ent-PartPredator = голова яутжи
+ent-PartPredator = predator body part
     .desc = { ent-BaseItem.desc }
-ent-TorsoPredator = торс яутжи
+ent-TorsoPredator = predator torso
     .desc = { ent-PartPredator.desc }
-ent-HeadPredator = голова яутжи
+ent-HeadPredator = predator head
     .desc = { ent-PartPredator.desc }
-ent-LeftArmPredator = левая рука яутжи
+ent-LeftArmPredator = left predator arm
     .desc = { ent-PartPredator.desc }
-ent-RightArmPredator = правая рука яутжи
+ent-RightArmPredator = right predator arm
     .desc = { ent-PartPredator.desc }
-ent-LeftHandPredator = левая кисть яутжи
+ent-LeftHandPredator = left predator hand
     .desc = { ent-PartPredator.desc }
-ent-RightHandPredator = правая кисть яутжи
+ent-RightHandPredator = right predator hand
     .desc = { ent-PartPredator.desc }
-ent-LeftLegPredator = левая нога яутжи
+ent-LeftLegPredator = left predator leg
     .desc = { ent-PartPredator.desc }
-ent-RightLegPredator = правая нога нога уятжи
+ent-RightLegPredator = right predator leg
     .desc = { ent-PartPredator.desc }
-ent-LeftFootPredator = левая стопа яутжи
+ent-LeftFootPredator = left predator foot
     .desc = { ent-PartPredator.desc }
-ent-RightFootPredator = правая стопа яутжи
+ent-RightFootPredator = right predator foot
     .desc = { ent-PartPredator.desc }

Resources/Locale/en-US/_prototypes/_sunrise/body/parts/tajaran.ftl

@@ -1,24 +1,24 @@
 ent-PartTajaran = tajaran body part
     .desc = { ent-BaseItem.desc }
-ent-TorsoTajaran = тело таяра
+ent-TorsoTajaran = tajaran torso
     .desc = { ent-PartTajaran.desc }
-ent-HeadTajaran = голова таяра
+ent-HeadTajaran = tajaran head
     .desc = { ent-PartTajaran.desc }
-ent-LeftArmTajaran = левая рука таяра
+ent-LeftArmTajaran = left tajaran arm
     .desc = { ent-PartTajaran.desc }
-ent-RightArmTajaran = правая рука таяра
+ent-RightArmTajaran = right tajaran arm
     .desc = { ent-PartTajaran.desc }
-ent-LeftHandTajaran = левая кисть таяра
+ent-LeftHandTajaran = left tajaran hand
     .desc = { ent-PartTajaran.desc }
-ent-RightHandTajaran = правая кисть таяра
+ent-RightHandTajaran = right tajaran hand
     .desc = { ent-PartTajaran.desc }
-ent-TailTajaran = хвост таяра
+ent-TailTajaran = tajaran tail
     .desc = { ent-PartTajaran.desc }
-ent-LeftLegTajaran = левая нога таяра
+ent-LeftLegTajaran = left tajaran leg
     .desc = { ent-PartTajaran.desc }
-ent-RightLegTajaran = правая нога таяра
+ent-RightLegTajaran = right tajaran leg
     .desc = { ent-PartTajaran.desc }
-ent-LeftFootTajaran = левая ступня таяра
+ent-LeftFootTajaran = left tajaran foot
     .desc = { ent-PartTajaran.desc }
-ent-RightFootTajaran = правая ступня таяра
+ent-RightFootTajaran = right tajaran foot
     .desc = { ent-PartTajaran.desc }

Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/backpacks/startergear/backpack.ftl

@@ -1,6 +1,6 @@
-ent-ClothingBackpackSyndieAJ100Filled = набор AJ-10
-    .desc = Включает в себя пистолет-пулемёт AJ-100 и два магазина патрон.
-ent-ClothingBackpackSyndieDL6902Filled = набор DL-6902
-    .desc = Включает в себя пулемёт DL6902 и один магазин патрон.
-ent-ClothingBackpackSyndieSIAR52Filled = набор SIAR-52
-    .desc = Включает в себя пулемёт SIAR-52 и два магазина патрон.
+ent-ClothingBackpackSyndieAJ100Filled = AJ-100 kit
+    .desc = Includes an AJ-100 submachine gun and two magazines of ammunition.
+ent-ClothingBackpackSyndieDL6902Filled = DL-6902 kit
+    .desc = Includes a DL6902 machine gun and one magazine of ammunition.
+ent-ClothingBackpackSyndieSIAR52Filled = SIAR-52 kit
+    .desc = Includes a SIAR-52 machine gun and two magazines of ammunition.

Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/backpacks/startergear/duffelbag.ftl

@@ -1,2 +1,2 @@
 ent-ClothingBackpackDuffelBoomboxBundle = syndicate boombox bundle
-    .desc = Убивайте со стилем
+    .desc = Kills with style.

Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers/head_of_prison.ftl

@@ -0,0 +1,3 @@
+ent-LockerHeadOfPrisonFilled = head of prison's locker
+    .suffix = Filled
+    .desc = { ent-LockerHeadOfSecurity.desc }

Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers/security.ftl

@@ -1,24 +1,24 @@
-ent-GunSafeEnergyGunMini = сейф миниатюрных энергетических пушек
+ent-GunSafeEnergyGunMini = mini energy cannons safe
     .suffix = SUNRISE
     .desc = { ent-GunSafe.desc }
-ent-GunSafePistolG22 = Сейф Глок-22
-    .suffix = SUNRISE
+ent-GunSafePistolG22 = safe
+    .suffix = Glock-22
     .desc = { ent-GunSafe.desc }
-ent-GunSafeRifleM16A4 = Сейф M16A4
-    .suffix = SUNRISE
+ent-GunSafeRifleM16A4 = safe
+    .suffix = M16A4
     .desc = { ent-GunSafe.desc }
-ent-GunSafeSubMachineGunVector = Сейф векторов
-    .suffix = SUNRISE
+ent-GunSafeSubMachineGunVector = safe
+    .suffix = Vector
     .desc = { ent-GunSafe.desc }
-ent-GunSafeShotgunPaladin = Сейф Паладинов 12
-    .suffix = SUNRISE
+ent-GunSafeShotgunPaladin = safe
+    .suffix = Paladin 12
     .desc = { ent-GunSafe.desc }
-ent-GunSafeShotgunTrenchgun4034 = Сейф Тренчганов 4034
-    .suffix = SUNRISE
+ent-GunSafeShotgunTrenchgun4034 = safe
+    .suffix = Trenchgun 4034
     .desc = { ent-GunSafe.desc }
-ent-GunSafeSubMachineGunMP38 = Сейф MP-38
-    .suffix = SUNRISE
+ent-GunSafeSubMachineGunMP38 = safe
+    .suffix = MP-38
     .desc = { ent-GunSafe.desc }
-ent-GunSafeEnergyGun = сейф энергетических пушек
-    .suffix = SUNRISE
+ent-GunSafeEnergyGun = safe
+    .suffix = Energy guns
     .desc = { ent-GunSafe.desc }

Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/back/backpacks.ftl

@@ -1,5 +1,5 @@
-ent-ClothingBackpackSyndie = Рюкзак Синдиката
-    .desc = Рюкзак оперативника с повышенной вместительностью.
+ent-ClothingBackpackSyndie = syndie backpack
+    .desc = An operative's backpack with increased capacity.
 ent-ClothingMilitaryBackpack = army backpack
     .desc = A spacious backpack with lots of pockets, worn by military structures.
 ent-ClothingDeathSquadronBackpack = death squadron backpack
@@ -8,7 +8,7 @@ ent-ClothingBackpackCE = chief engineer backpack
     .desc = Technicially progressive backpack.
 ent-ClothingBackpackBlueShield = blue shield's backpack
     .desc = Superior.
-ent-ClothingBackpackPrisonGuard = рюкзак сотрудника кт
-    .desc = На стиле.
+ent-ClothingBackpackPrisonGuard = prison guard's backpack
+    .desc = On style.
 ent-ClothingBackpackAdjutant = adjutant backpack
     .desc = Predominantly composed of multiforaments tied together with threads.