Impove terms and wording

- Use "Latest" and "Prior" instead of "~~Current~~" and "~~Old~~"
- Clarify licensing

data/2024Q4/2-process/gcs_status_combined_totals.csv

@@ -1,4 +1,4 @@
 "CC legal tool","Count"
-"Current","1170680000"
-"Old","33776380800"
+"Latest","1170680000"
+"Prior","33776380800"
 "Retired","1821675241"

data/2024Q4/README.md

@@ -42,28 +42,28 @@ Plots showing Creative Commons (CC) legal tool status totals and percentages.
 <!-- CC legal tools status End -->
 
 
-<!-- Current CC legal tools Start -->
+<!-- Latest CC legal tools Start -->
 
-### Current CC legal tools
+### Latest CC legal tools
 
-![Plots showing current Creative Commons (CC) legal tool totals and percentages.](3-report/gcs_status_current_tools.png)
+![Plots showing latest Creative Commons (CC) legal tool totals and percentages.](3-report/gcs_status_latest_tools.png)
 
-Plots showing current Creative Commons (CC) legal tool totals and percentages.
+Plots showing latest Creative Commons (CC) legal tool totals and percentages.
 
-<!-- Current CC legal tools End -->
+<!-- Latest CC legal tools End -->
 
 
-<!-- Old CC legal tools Start -->
+<!-- Prior CC legal tools Start -->
 
-### Old CC legal tools
+### Prior CC legal tools
 
-![Plots showing old Creative Commons (CC) legal tool totals and percentages.](3-report/gcs_status_old_tools.png)
+![Plots showing prior Creative Commons (CC) legal tool totals and percentages.](3-report/gcs_status_prior_tools.png)
 
-Plots showing old Creative Commons (CC) legal tool totals and percentages.
+Plots showing prior Creative Commons (CC) legal tool totals and percentages.
 
 The unit names have been normalized (~~`CC BY-ND-NC`~~ => `CC BY-NC-ND`).
 
-<!-- Old CC legal tools End -->
+<!-- Prior CC legal tools End -->
 
 
 <!-- Retired CC legal tools Start -->
@@ -79,34 +79,34 @@ For more information on retired legal tools, see [Retired Legal Tools - Creative
 <!-- Retired CC legal tools End -->
 
 
-<!-- Countries with highest usage of current tools Start -->
+<!-- Countries with highest usage of latest tools Start -->
 
-### Countries with highest usage of current tools
+### Countries with highest usage of latest tools
 
-![Plots showing countries with the highest useage of the current Creative Commons (CC) legal tools.](3-report/gcs_countries_highest_usage_current_tools.png)
+![Plots showing countries with the highest useage of the latest Creative Commons (CC) legal tools.](3-report/gcs_countries_highest_usage_latest_tools.png)
 
-Plots showing countries with the highest useage of the current Creative Commons (CC) legal tools.
+Plots showing countries with the highest useage of the latest Creative Commons (CC) legal tools.
 
-The current tools include Licenses version 4.0 (CC BY 4.0, CC BY-NC 4.0, CC BY-NC-ND 4.0, CC BY-NC-SA 4.0, CC-BY-ND 4.0, CC BY-SA 4.0), CC0 1.0, and the Public Domain Mark (PDM 1.0).
+The latest tools include Licenses version 4.0 (CC BY 4.0, CC BY-NC 4.0, CC BY-NC-ND 4.0, CC BY-NC-SA 4.0, CC-BY-ND 4.0, CC BY-SA 4.0), CC0 1.0, and the Public Domain Mark (PDM 1.0).
 
-The complete data set indicates there are a total of 2,220,330,077 online works using a current CC legal tool.
+The complete data set indicates there are a total of 2,220,330,077 online works using a latest CC legal tool.
 
-<!-- Countries with highest usage of current tools End -->
+<!-- Countries with highest usage of latest tools End -->
 
 
-<!-- Languages with highest usage of current tools Start -->
+<!-- Languages with highest usage of latest tools Start -->
 
-### Languages with highest usage of current tools
+### Languages with highest usage of latest tools
 
-![Plots showing languages with the highest useage of the current Creative Commons (CC) legal tools.](3-report/gcs_languages_highest_usage_current_tools.png)
+![Plots showing languages with the highest useage of the latest Creative Commons (CC) legal tools.](3-report/gcs_languages_highest_usage_latest_tools.png)
 
-Plots showing languages with the highest useage of the current Creative Commons (CC) legal tools.
+Plots showing languages with the highest useage of the latest Creative Commons (CC) legal tools.
 
-The current tools include Licenses version 4.0 (CC BY 4.0, CC BY-NC 4.0, CC BY-NC-ND 4.0, CC BY-NC-SA 4.0, CC-BY-ND 4.0, CC BY-SA 4.0), CC0 1.0, and the Public Domain Mark (PDM 1.0).
+The latest tools include Licenses version 4.0 (CC BY 4.0, CC BY-NC 4.0, CC BY-NC-ND 4.0, CC BY-NC-SA 4.0, CC-BY-ND 4.0, CC BY-SA 4.0), CC0 1.0, and the Public Domain Mark (PDM 1.0).
 
-The complete data set indicates there are a total of 970,145,024 online works using a current CC legal tool.
+The complete data set indicates there are a total of 970,145,024 online works using a latest CC legal tool.
 
-<!-- Languages with highest usage of current tools End -->
+<!-- Languages with highest usage of latest tools End -->
 
 
 <!-- Approved for Free Cultural Works Start -->
@@ -156,10 +156,10 @@ The data used to generate this report is available in that repository at the fol
 
 ### Usage
 
-The Creative Commons (CC) icons, images, and logos are for use under the Creative Commons Trademark Policy (see [Policies - Creative Commons][ccpolicies]). **They *aren't* licensed under a Creative Commons license** (also see [Could I use a CC license to share my logo or trademark? - Frequently Asked Questions - Creative Commons][tmfaq]).
+The Creative Commons (CC) icons and logos are for use under the Creative Commons Trademark Policy (see [Policies - Creative Commons][ccpolicies]). **They *aren't* licensed under a Creative Commons license** (also see [Could I use a CC license to share my logo or trademark? - Frequently Asked Questions - Creative Commons][tmfaq]).
 
 [![CC0 1.0 Universal (CC0 1.0) Public Domain Dedicationbutton][cc-zero-png]][cc-zero]
-Otherwise, this report is dedicated to the public domain under the [CC0 1.0 Universal (CC0 1.0) Public Domain Dedication][cc-zero].
+Otherwise, this report (including the plot images) is dedicated to the public domain under the [CC0 1.0 Universal (CC0 1.0) Public Domain Dedication][cc-zero].
 
 [ccpolicies]: https://creativecommons.org/policies
 [tmfaq]: https://creativecommons.org/faq/#could-i-use-a-cc-license-to-share-my-logo-or-trademark

scripts/2-process/gcs_process.py

@@ -114,12 +114,12 @@ def process_product_totals(args, count_data):
     data_to_csv(args, data, file_path)
 
 
-def process_current_old_retired_totals(args, count_data):
+def process_latest_prior_retired_totals(args, count_data):
     """
-    Process count data: totals by unit in three categories: current, old,
+    Process count data: totals by unit in three categories: latest, prior,
     and retired
     """
-    LOGGER.info(process_current_old_retired_totals.__doc__.strip())
+    LOGGER.info(process_latest_prior_retired_totals.__doc__.strip())
     # https://creativecommons.org/retiredlicenses/
     retired = [
         # DevNations,
@@ -143,8 +143,8 @@ def process_current_old_retired_totals(args, count_data):
         # ShareAlike
         "CC SA ",
     ]
-    data = {"current": {}, "old": {}, "retired": {}}
-    status = {"Current": 0, "Old": 0, "Retired": 0}
+    data = {"latest": {}, "prior": {}, "retired": {}}
+    status = {"Latest": 0, "Prior": 0, "Retired": 0}
     for row in count_data.itertuples(index=False):
         tool = row[0]
         count = row[1]
@@ -156,26 +156,26 @@ def process_current_old_retired_totals(args, count_data):
                 tool_begin = tool[:separator]
         if not tool_begin:
             tool_begin = tool
-        # Current
+        # Latest
         if (
             ("BY" in tool and "4.0" in tool)
             or tool.startswith("CC0")
             or tool.startswith("PDM")
         ):
             try:
-                data["current"][tool] += count
+                data["latest"][tool] += count
             except KeyError:
-                data["current"][tool] = count
-            status["Current"] += count
-        # Old
+                data["latest"][tool] = count
+            status["Latest"] += count
+        # Prior
         elif "BY" in tool and tool_begin not in retired:
             if "ND-NC" in tool_begin:
                 tool_begin = tool_begin.replace("ND-NC", "NC-ND")
             try:
-                data["old"][tool_begin.strip()] += count
+                data["prior"][tool_begin.strip()] += count
             except KeyError:
-                data["old"][tool_begin.strip()] = count
-            status["Old"] += count
+                data["prior"][tool_begin.strip()] = count
+            status["Prior"] += count
         # Retired
         else:
             try:
@@ -313,7 +313,7 @@ def main():
     file1_count = shared.path_join(PATHS["data_1-fetch"], "gcs_1_count.csv")
     count_data = pd.read_csv(file1_count, usecols=["TOOL_IDENTIFIER", "COUNT"])
     process_product_totals(args, count_data)
-    process_current_old_retired_totals(args, count_data)
+    process_latest_prior_retired_totals(args, count_data)
     process_totals_by_free_cultural(args, count_data)
     process_totals_by_restrictions(args, count_data)
 

scripts/3-report/gcs_report.py

@@ -188,21 +188,21 @@ def plot_tool_status(args):
     )
 
 
-def plot_current_tools(args):
+def plot_latest_tools(args):
     """
-    Create plots for current CC legal tool totals and percentages
+    Create plots for latest CC legal tool totals and percentages
     """
-    LOGGER.info(plot_current_tools.__doc__.strip())
+    LOGGER.info(plot_latest_tools.__doc__.strip())
     file_path = shared.path_join(
         PATHS["data_2-process"],
-        "gcs_status_current_totals.csv",
+        "gcs_status_latest_totals.csv",
     )
     LOGGER.info(f"data file: {file_path.replace(PATHS['repo'], '.')}")
     name_label = "CC legal tool"
     data = pd.read_csv(file_path, index_col=name_label)
     data.sort_values(name_label, ascending=False, inplace=True)
 
-    title = "Current CC legal tools"
+    title = "Latest CC legal tools"
     plt = plot.combined_plot(
         args=args,
         data=data,
@@ -212,7 +212,7 @@ def plot_current_tools(args):
     )
 
     image_path = shared.path_join(
-        PATHS["data_phase"], "gcs_status_current_tools.png"
+        PATHS["data_phase"], "gcs_status_latest_tools.png"
     )
     LOGGER.info(f"image file: {image_path.replace(PATHS['repo'], '.')}")
 
@@ -226,25 +226,25 @@ def plot_current_tools(args):
         SECTION,
         title,
         image_path,
-        "Plots showing current Creative Commons (CC) legal tool totals and"
+        "Plots showing latest Creative Commons (CC) legal tool totals and"
         " percentages.",
     )
 
 
-def plot_old_tools(args):
+def plot_prior_tools(args):
     """
-    Create plots for old CC legal tool totals and percentages
+    Create plots for prior CC legal tool totals and percentages
     """
-    LOGGER.info(plot_old_tools.__doc__.strip())
+    LOGGER.info(plot_prior_tools.__doc__.strip())
     file_path = shared.path_join(
-        PATHS["data_2-process"], "gcs_status_old_totals.csv"
+        PATHS["data_2-process"], "gcs_status_prior_totals.csv"
     )
     LOGGER.info(f"data file: {file_path.replace(PATHS['repo'], '.')}")
     name_label = "CC legal tool"
     data = pd.read_csv(file_path, index_col=name_label)
     data.sort_values(name_label, ascending=False, inplace=True)
 
-    title = "Old CC legal tools"
+    title = "Prior CC legal tools"
     plt = plot.combined_plot(
         args=args,
         data=data,
@@ -254,7 +254,7 @@ def plot_old_tools(args):
     )
 
     image_path = shared.path_join(
-        PATHS["data_phase"], "gcs_status_old_tools.png"
+        PATHS["data_phase"], "gcs_status_prior_tools.png"
     )
     LOGGER.info(f"image file: {image_path.replace(PATHS['repo'], '.')}")
 
@@ -268,7 +268,7 @@ def plot_old_tools(args):
         SECTION,
         title,
         image_path,
-        "Plots showing old Creative Commons (CC) legal tool totals and"
+        "Plots showing prior Creative Commons (CC) legal tool totals and"
         " percentages.",
         "The unit names have been normalized (~~`CC BY-ND-NC`~~ =>"
         " `CC BY-NC-ND`).",
@@ -323,7 +323,7 @@ def plot_retired_tools(args):
 
 def plot_countries_highest_usage(args):
     """
-    Create plots for the countries with highest usage of current tools
+    Create plots for the countries with highest usage of latest tools
     """
     LOGGER.info(plot_countries_highest_usage.__doc__.strip())
     file_path = shared.path_join(
@@ -338,7 +338,7 @@ def plot_countries_highest_usage(args):
     data = data[:10]  # limit to highest 10
     data = data[::-1]  # reverse order
 
-    title = "Countries with highest usage of current tools"
+    title = "Countries with highest usage of latest tools"
     plt = plot.combined_plot(
         args=args,
         data=data,
@@ -349,7 +349,7 @@ def plot_countries_highest_usage(args):
     )
 
     image_path = shared.path_join(
-        PATHS["data_phase"], "gcs_countries_highest_usage_current_tools.png"
+        PATHS["data_phase"], "gcs_countries_highest_usage_latest_tools.png"
     )
     LOGGER.info(f"image file: {image_path.replace(PATHS['repo'], '.')}")
 
@@ -363,20 +363,20 @@ def plot_countries_highest_usage(args):
         SECTION,
         title,
         image_path,
-        "Plots showing countries with the highest useage of the current"
+        "Plots showing countries with the highest useage of the latest"
         " Creative Commons (CC) legal tools.",
-        "The current tools include Licenses version 4.0 (CC BY 4.0, CC BY-NC"
+        "The latest tools include Licenses version 4.0 (CC BY 4.0, CC BY-NC"
         " 4.0, CC BY-NC-ND 4.0, CC BY-NC-SA 4.0, CC-BY-ND 4.0, CC BY-SA 4.0),"
         " CC0 1.0, and the Public Domain Mark (PDM 1.0).\n"
         "\n"
         f"The complete data set indicates there are a total of {total_count}"
-        " online works using a current CC legal tool.",
+        " online works using a latest CC legal tool.",
     )
 
 
 def plot_languages_highest_usage(args):
     """
-    Create plots for the languages with highest usage of current tools
+    Create plots for the languages with highest usage of latest tools
     """
     LOGGER.info(plot_languages_highest_usage.__doc__.strip())
     file_path = shared.path_join(
@@ -391,7 +391,7 @@ def plot_languages_highest_usage(args):
     data = data[:10]  # limit to highest 10
     data = data[::-1]  # reverse order
 
-    title = "Languages with highest usage of current tools"
+    title = "Languages with highest usage of latest tools"
     plt = plot.combined_plot(
         args=args,
         data=data,
@@ -402,7 +402,7 @@ def plot_languages_highest_usage(args):
     )
 
     image_path = shared.path_join(
-        PATHS["data_phase"], "gcs_languages_highest_usage_current_tools.png"
+        PATHS["data_phase"], "gcs_languages_highest_usage_latest_tools.png"
     )
     LOGGER.info(f"image file: {image_path.replace(PATHS['repo'], '.')}")
 
@@ -416,20 +416,20 @@ def plot_languages_highest_usage(args):
         SECTION,
         title,
         image_path,
-        "Plots showing languages with the highest useage of the current"
+        "Plots showing languages with the highest useage of the latest"
         " Creative Commons (CC) legal tools.",
-        "The current tools include Licenses version 4.0 (CC BY 4.0, CC BY-NC"
+        "The latest tools include Licenses version 4.0 (CC BY 4.0, CC BY-NC"
         " 4.0, CC BY-NC-ND 4.0, CC BY-NC-SA 4.0, CC-BY-ND 4.0, CC BY-SA 4.0),"
         " CC0 1.0, and the Public Domain Mark (PDM 1.0).\n"
         "\n"
         f"The complete data set indicates there are a total of {total_count}"
-        " online works using a current CC legal tool.",
+        " online works using a latest CC legal tool.",
     )
 
 
 def plot_free_culture(args):
     """
-    Create plots for the languages with highest usage of current tools
+    Create plots for the languages with highest usage of latest tools
     """
     LOGGER.info(plot_free_culture.__doc__.strip())
     file_path = shared.path_join(
@@ -478,8 +478,8 @@ def main():
     gcs_intro(args)
     plot_products(args)
     plot_tool_status(args)
-    plot_current_tools(args)
-    plot_old_tools(args)
+    plot_latest_tools(args)
+    plot_prior_tools(args)
     plot_retired_tools(args)
     plot_countries_highest_usage(args)
     plot_languages_highest_usage(args)

scripts/3-report/notes.py

@@ -104,17 +104,18 @@ def usage(args):
         "Usage",
         None,
         None,
-        "The Creative Commons (CC) icons, images, and logos are for use under"
-        " the Creative Commons Trademark Policy (see [Policies - Creative"
+        "The Creative Commons (CC) icons and logos are for use under the"
+        " Creative Commons Trademark Policy (see [Policies - Creative"
         " Commons][ccpolicies]). **They *aren't* licensed under a Creative"
         " Commons license** (also see [Could I use a CC license to share my"
         " logo or trademark? - Frequently Asked Questions - Creative"
         " Commons][tmfaq]).\n"
         "\n"
         "[![CC0 1.0 Universal (CC0 1.0) Public Domain Dedication"
         "button][cc-zero-png]][cc-zero]\n"
-        "Otherwise, this report is dedicated to the public domain under the"
-        " [CC0 1.0 Universal (CC0 1.0) Public Domain Dedication][cc-zero].\n"
+        "Otherwise, this report (including the plot images) is dedicated to"
+        " the public domain under the [CC0 1.0 Universal (CC0 1.0) Public"
+        " Domain Dedication][cc-zero].\n"
         "\n"
         "[ccpolicies]: https://creativecommons.org/policies\n"
         "[tmfaq]: https://creativecommons.org/faq/"