Fix | была фатальная ошибка после конфликтов слияния

2 months ago · 79ea13566a
parent 11337a4754
commit 79ea13566a
4 changed files with 84 additions and 78 deletions
--- a/wp-content/themes/cosmopet/global-functions/multilang-functions.php
+++ b/wp-content/themes/cosmopet/global-functions/multilang-functions.php
@ -48,6 +48,15 @@ add_action('init', function () {
                ],
                'group' => 'General',
            ],
+            [
+                'name' => 'Заголовок (скрытый) H1 на главной',
+                'string' => 'КОРМ БУДУЩЕГО ДЛЯ ВАШЕГО ПИТОМЦА',
+                'translations' => [
+                    'ru' => 'КОРМ БУДУЩЕГО ДЛЯ ВАШЕГО ПИТОМЦА',
+                    'en' => 'FOOD OF THE FUTURE FOR YOUR PET',
+                ],
+                'group' => 'General',
+            ],
            [
                'name' => 'НАПИШИТЕ НАМ',
                'string' => 'НАПИШИТЕ НАМ',
--- a/wp-content/themes/cosmopet/global-functions/multisite-functions.php
+++ b/wp-content/themes/cosmopet/global-functions/multisite-functions.php
@ -426,4 +426,4 @@ function woocommerce_ajax_add_to_cart() {
    }

    wp_die();
-}
+}}
--- a/wp-content/themes/cosmopet/templates/front-page/front-page.twig
+++ b/wp-content/themes/cosmopet/templates/front-page/front-page.twig
@ -6,11 +6,8 @@
 {% block content %}

    <section class="home">
-<<<<<<< HEAD
-        <h1 class="home__title invisible">КОРМ БУДУЩЕГО ДЛЯ ВАШЕГО ПИТОМЦА</h1>
-=======
-        <h1 class="home__title invisible">FOOD OF THE FUTURE FOR YOUR PET</h1>
->>>>>>> web_87
+        <h1 class="home__title invisible">{{ function('pll_e', 'Заголовок (скрытый) H1 на главной') }}</h1>
+
        <div class="container">
            <div class="home__swiper">
                <div class="swiper-wrapper">    
--- a/wp-content/themes/cosmopet/templates/layout.twig
+++ b/wp-content/themes/cosmopet/templates/layout.twig
@ -2,7 +2,9 @@
 <!DOCTYPE html>
 <html lang="ru">
    <head>
+        
        {{ function('wp_head') }}
+
        <title>{{ function('wp_title') }} </title>
        <meta charset="UTF-8">
        <meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -23,22 +25,23 @@
        <noscript><div><img src="https://top-fwz1.mail.ru/counter?id=3569464;js=na" style="position:absolute;left:-9999px;" alt="Top.Mail.Ru" /></div></noscript>
        <!-- /Top.Mail.Ru counter -->

-        <!-- Yandex.Metrika counter -->
-        <script type="text/javascript" >
        <meta name="yandex-verification" content="2da3f924c37aec09" />
+        <meta name="yandex-verification" content="2109bb636b61b248" />
        <meta name="facebook-domain-verification" content="0t1n3h5uw4gdcpc1smgnnceaya7ek9" />
        <meta name="google-site-verification" content="rHrHfWw6KM9echj8buJwfSPdVJLPECX0uhRTtyRX5F4" />	
+        
        <!-- Google tag (gtag.js) -->
        <script async src="https://www.googletagmanager.com/gtag/js?id=G-WTY3GTXP5J"></script>
        <script async>
            window.dataLayer = window.dataLayer || [];
            function gtag(){dataLayer.push(arguments);}
            gtag('js', new Date());
-
            gtag('config', 'G-WTY3GTXP5J');
        </script>
+        <!-- /Google tag (gtag.js) -->

        <!-- Yandex.Metrika counter -->
+        {# RU - счетчик #}
        <script async type="text/javascript" >
            (function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
            m[i].l=1*new Date();
@ -57,15 +60,13 @@
        </script>
        <noscript><div><img src="https://mc.yandex.ru/watch/96481053" style="position:absolute; left:-9999px;" alt="" /></div></noscript>

-        <meta name="yandex-verification" content="2109bb636b61b248" />
-
-         
+        {# AE - счетчик #}
        <script>
            (function(w,d,u){
            var s=d.createElement('script');s.async=true;s.src=u+'?'+(Date.now()/60000|0);
            var h=d.getElementsByTagName('script')[0];h.parentNode.insertBefore(s,h);
            })(window,document,'https://cdn-ru.bitrix24.ru/b33297602/crm/tag/call.tracker.js');
-        </script>
+       
            ym(100896819, "init", {
                    clickmap:true,
                    trackLinks:true,
@ -96,20 +97,19 @@
        src="https://www.facebook.com/tr?id=1791804684725971&ev=PageView&noscript=1"
        />
        </noscript>
-        <!-- End Meta Pixel Code -->
-    </head>
+        <!-- /Meta Pixel Code -->

-    <body class="{{bodyClass}}">


-        {% include 'header.twig' %}
+    </head>

+    <body class="{{bodyClass}}">
+        {% include 'header.twig' %}
        <main class="{{ mainClass }}">
            {% block content %}
            {% endblock %}
            {% include 'modal.twig' %}
        </main>
-        
        {% include 'footer.twig' %}
        </div>
            {{ function('wp_footer') }}