From 10eed4b9e3d3dea95ca525fb3fdff54cffd9daad Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Wed, 21 Feb 2024 15:34:22 +0100
Subject: [PATCH] Update TinyMCE format icon names for alignment styles.

Coming from Plone 5.2, you will have 'alignleft', which needs to be 'align-left', etc.
---
 news/3095.bugfix               |  2 +-
 plone/app/upgrade/v60/final.py | 35 ++++++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/news/3095.bugfix b/news/3095.bugfix
index d78152cd..5a402d8e 100644
--- a/news/3095.bugfix
+++ b/news/3095.bugfix
@@ -1,2 +1,2 @@
 Update TinyMCE format icon names.
-[petschki]
+[petschki, maurits]
diff --git a/plone/app/upgrade/v60/final.py b/plone/app/upgrade/v60/final.py
index 512544c5..2b1c475d 100644
--- a/plone/app/upgrade/v60/final.py
+++ b/plone/app/upgrade/v60/final.py
@@ -208,21 +208,36 @@ def fix_syndication_settings(context):
             del registry.records[key]
 
 
-def fix_tinymce_format_iconnames(context):
-    """Fix 'strike-through' and 'sourcecode'.
-
-    See https://github.com/plone/Products.CMFPlone/issues/3905
-    """
+def _replace_values_in_record(record_name, *replacements):
+    """Take the values of a registry record and replace some of them."""
     registry = getUtility(IRegistry)
-    record = registry.records.get("plone.inline_styles")
+    record = registry.records.get(record_name)
     if record is None:
         return
     values = record.value
-    replacements = [
-        ("Strikethrough|strikethrough|strikethrough", "Strikethrough|strikethrough|strike-through"),
-        ("Code|code|code", "Code|code|sourcecode")
-    ]
     for _old, _new in replacements:
         if _old in values:
             values[values.index(_old)] = _new
     record.value = values
+
+
+def fix_tinymce_format_iconnames(context):
+    """Fix various TinyMCE formats to have the correct icon name.
+
+    See https://github.com/plone/Products.CMFPlone/issues/3905
+    """
+    _replace_values_in_record(
+        "plone.inline_styles",
+        (
+            "Strikethrough|strikethrough|strikethrough",
+            "Strikethrough|strikethrough|strike-through",
+        ),
+        ("Code|code|code", "Code|code|sourcecode"),
+    )
+    _replace_values_in_record(
+        "plone.alignment_styles",
+        ("Left|alignleft|alignleft", "Left|alignleft|align-left"),
+        ("Center|aligncenter|aligncenter", "Center|aligncenter|align-center"),
+        ("Right|alignright|alignright", "Right|alignright|align-right"),
+        ("Justify|alignjustify|alignjustify", "Justify|alignjustify|align-justify"),
+    )