Remplacement de Twitter par X (#6627)

zestedesavoir · Aug 13, 2024 · 23c78ec · 23c78ec
1 parent d700a62
commit 23c78ec
Show file tree

Hide file tree

Showing 19 changed files with 18 additions and 15 deletions.
diff --git a/assets/images/brands/X.svg b/assets/images/brands/X.svg
diff --git a/assets/images/sprite/X-blue.png b/assets/images/sprite/X-blue.png
diff --git a/assets/images/sprite/[email protected] b/assets/images/sprite/[email protected]
diff --git a/assets/images/sprite/X-light.png b/assets/images/sprite/X-light.png
diff --git a/assets/images/sprite/[email protected] b/assets/images/sprite/[email protected]
diff --git a/assets/images/sprite/X.png b/assets/images/sprite/X.png
diff --git a/assets/images/sprite/[email protected] b/assets/images/sprite/[email protected]
diff --git a/assets/images/sprite/twitter-blue.png b/assets/images/sprite/twitter-blue.png
diff --git a/assets/images/sprite/[email protected] b/assets/images/sprite/[email protected]
diff --git a/assets/images/sprite/twitter-light.png b/assets/images/sprite/twitter-light.png
diff --git a/assets/images/sprite/[email protected] b/assets/images/sprite/[email protected]
diff --git a/assets/images/sprite/twitter.png b/assets/images/sprite/twitter.png
diff --git a/assets/images/sprite/[email protected] b/assets/images/sprite/[email protected]
diff --git a/assets/scss/base/_icons.scss b/assets/scss/base/_icons.scss
@@ -377,15 +377,15 @@
         }
     }
 
-    &.twitter {
+    &.X {
         &:after {
-            @include sprite-position($twitter);
+            @include sprite-position($X);
         }
         &.blue:after {
-            @include sprite-position($twitter-blue);
+            @include sprite-position($X-blue);
         }
         &.light:after {
-            @include sprite-position($twitter-light);
+            @include sprite-position($X-light);
         }
     }
 

diff --git a/templates/base.html b/templates/base.html
@@ -68,7 +68,7 @@
     {% endblock %}
 
 
-    {# Twitter cards #}
+    {# X cards #}
     <meta property="twitter:domain" content="{{app.site.url}}/">
     {% if request.GET.twittercard == 'large' %}
         <meta property="twitter:card" content="summary_large_image">
@@ -79,7 +79,7 @@
     <meta property="twitter:title" content="{{ title|safe }}">
     <meta property="twitter:description" content="{{ description|safe }}">
     <meta property="twitter:site" content="@{{app.site.name}}">
-    <meta property="twitter:creator" content="@{% block twitter_creator %}{{app.site.name}}{% endblock %}">
+    <meta property="twitter:creator" content="@{{app.site.name}}">
     <meta property="twitter:image" content="http://{{ meta_image }}">
 
     {% block DCMI_cards %}{% endblock %}

diff --git a/templates/footer.html b/templates/footer.html
@@ -31,11 +31,11 @@
                 </li>
             {% endif %}
 
-            {% if app.site.social.twitter %}
+            {% if app.site.social.X %}
                 <li>
-                    <a href="{{app.site.social.twitter}}"
-                       title="Suivez-nous sur Twitter"
-                       class="btn ico-after twitter light btn-twitter btn-holder"></a>
+                    <a href="{{app.site.social.X}}"
+                       title="Suivez-nous sur X"
+                       class="btn ico-after X light btn-X btn-holder"></a>
                 </li>
             {% endif %}
 

diff --git a/templates/misc/social_buttons.part.html b/templates/misc/social_buttons.part.html
@@ -4,11 +4,11 @@
     <h3>{% trans "Partager" %}</h3>
     <ul>
         <li>
-            <a href="https://twitter.com/share?url={{ app.site.url }}{{ link }}&amp;text={{ text }}"
-               class="ico-after twitter blue"
+            <a href="https://x.com/share?url={{ app.site.url }}{{ link }}&amp;text={{ text }}"
+               class="ico-after X blue"
                rel="nofollow"
             >
-                Twitter
+                X
             </a>
         </li>
         <li>

diff --git a/zds/settings/abstract_base/zds.py b/zds/settings/abstract_base/zds.py
@@ -110,7 +110,7 @@
         "social": {
             "mastodon": "https://framapiaf.org/@ZesteDeSavoir",
             "facebook": "https://www.facebook.com/ZesteDeSavoir",
-            "twitter": "https://twitter.com/ZesteDeSavoir",
+            "X": "https://x.com/ZesteDeSavoir",
             "github": "https://github.com/zestedesavoir/zds-site",
             "discord": "https://discord.com/invite/ue5MTKq",
         },

diff --git a/zds/tutorialv2/tests/tests_views/tests_published.py b/zds/tutorialv2/tests/tests_views/tests_published.py
@@ -2005,7 +2005,7 @@ def check_images_socials(self, result, pattern_link_image, title, description):
 
     def test_social_cards_without_image(self):
         """
-        Check that all cards are produce for social network twitter
+        Check that all cards are produce for social network X
         """
         # test access for guest user (bot of social network for example)
         self.client.logout()