Merge branch 'main' of github.com:bocharsky-bw/stand-with-ukraine-bun…

…dle into tweak-listener-priority
bocharsky-bw · Jun 4, 2022 · 708c72e · 708c72e
2 parents 9dc13d5 + 26956a8
commit 708c72e
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,9 +1,8 @@
 name: CI
 on:
     push:
-        branches: [ main ]
-    pull_request:
         branches: [ $default-branch ]
+    pull_request:
 permissions:
     contents: read
 jobs:

diff --git a/src/Resources/translations/StandWithUkraineBundle+intl-icu.en.xlf b/src/Resources/translations/StandWithUkraineBundle+intl-icu.en.xlf
@@ -14,6 +14,14 @@
                 <source>stand_with_ukraine.access_denied.link</source>
                 <target>https://en.wikipedia.org/wiki/Russian_warship,_go_fuck_yourself</target>
             </trans-unit>
+            <trans-unit id="4">
+                <source>stand_with_ukraine.access_denied.why</source>
+                <target>Why?</target>
+            </trans-unit>
+            <trans-unit id="5">
+                <source>stand_with_ukraine.access_denied.fix</source>
+                <target>How to fix?</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Resources/translations/StandWithUkraineBundle+intl-icu.ru.xlf b/src/Resources/translations/StandWithUkraineBundle+intl-icu.ru.xlf
@@ -14,6 +14,14 @@
                 <source>stand_with_ukraine.access_denied.link</source>
                 <target>https://ru.wikipedia.org/wiki/%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9_%D0%B2%D0%BE%D0%B5%D0%BD%D0%BD%D1%8B%D0%B9_%D0%BA%D0%BE%D1%80%D0%B0%D0%B1%D0%BB%D1%8C,_%D0%B8%D0%B4%D0%B8_%D0%BD%D0%B0_%D1%85%D1%83%D0%B9</target>
             </trans-unit>
+            <trans-unit id="4">
+                <source>stand_with_ukraine.access_denied.why</source>
+                <target>Почему?</target>
+            </trans-unit>
+            <trans-unit id="5">
+                <source>stand_with_ukraine.access_denied.fix</source>
+                <target>Как исправить?</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Resources/translations/StandWithUkraineBundle+intl-icu.uk.xlf b/src/Resources/translations/StandWithUkraineBundle+intl-icu.uk.xlf
@@ -14,6 +14,14 @@
                 <source>stand_with_ukraine.access_denied.link</source>
                 <target>https://uk.wikipedia.org/wiki/%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9_%D0%B2%D0%BE%D0%B5%D0%BD%D0%BD%D1%8B%D0%B9_%D0%BA%D0%BE%D1%80%D0%B0%D0%B1%D0%BB%D1%8C,_%D0%B8%D0%B4%D0%B8_%D0%BD%D0%B0_%D1%85%D1%83%D0%B9</target>
             </trans-unit>
+            <trans-unit id="4">
+                <source>stand_with_ukraine.access_denied.why</source>
+                <target>Чому?</target>
+            </trans-unit>
+            <trans-unit id="5">
+                <source>stand_with_ukraine.access_denied.fix</source>
+                <target>Як виправити?</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Resources/views/ban-country.html.twig b/src/Resources/views/ban-country.html.twig
@@ -5,5 +5,5 @@
 {% block swu_links %}
     {{ parent() }}
     <br>
-    <a class="link-secondary" href="https://github.com/bocharsky-bw/stand-with-ukraine-bundle/blob/master/docs/vpn.md" target="_blank" rel="nofollow" referrerpolicy="origin-when-cross-origin">How to fix?</a>
+    <a class="link-secondary" href="https://github.com/bocharsky-bw/stand-with-ukraine-bundle/blob/master/docs/vpn.md" target="_blank" rel="nofollow" referrerpolicy="origin-when-cross-origin">{{ 'stand_with_ukraine.access_denied.fix'|trans({}, 'StandWithUkraineBundle') }}</a>
 {% endblock %}
diff --git a/src/Resources/views/ban-language.html.twig b/src/Resources/views/ban-language.html.twig
@@ -5,5 +5,5 @@
 {% block swu_links %}
     {{ parent() }}
     <br>
-    <a class="link-secondary" href="https://github.com/bocharsky-bw/stand-with-ukraine-bundle/blob/master/docs/preferred-language.md#{{ browserName }}" title="See instructions about how to fix this for your {{ browserName }} browser" target="_blank" rel="nofollow" referrerpolicy="origin-when-cross-origin">How to fix?</a>
+    <a class="link-secondary" href="https://github.com/bocharsky-bw/stand-with-ukraine-bundle/blob/master/docs/preferred-language.md#{{ browserName }}" title="See instructions about how to fix this for your {{ browserName }} browser" target="_blank" rel="nofollow" referrerpolicy="origin-when-cross-origin">{{ 'stand_with_ukraine.access_denied.fix'|trans({}, 'StandWithUkraineBundle') }}</a>
 {% endblock %}
diff --git a/src/Resources/views/base.html.twig b/src/Resources/views/base.html.twig
@@ -69,7 +69,7 @@
                     {% if useLinks %}
                         <div class="text-right">
                             {% block swu_links %}
-                                <a class="link-secondary" href="https://github.com/bocharsky-bw/stand-with-ukraine-bundle#standwithukrainebundle" target="_blank" rel="nofollow" referrerpolicy="origin-when-cross-origin">Why?</a>
+                                <a class="link-secondary" href="https://github.com/bocharsky-bw/stand-with-ukraine-bundle#standwithukrainebundle" target="_blank" rel="nofollow" referrerpolicy="origin-when-cross-origin">{{ 'stand_with_ukraine.access_denied.why'|trans({}, 'StandWithUkraineBundle') }}</a>
                             {% endblock %}
                         </div>
                     {% endif %}