[5.0] schemaorg fix schema forms

[joomlapl-bot]

PR w związku ze zmianą oryginału https://github.com/joomla/joomla-cms/pull/41323 Poniżej zmiany w oryginale:

Click to expand the diff!

```diff diff --git a/administrator/language/en-GB/plg_schemaorg_blogposting.ini b/administrator/language/en-GB/plg_schemaorg_blogposting.ini index 5de60c018ca7..929390b7319b 100755 --- a/administrator/language/en-GB/plg_schemaorg_blogposting.ini +++ b/administrator/language/en-GB/plg_schemaorg_blogposting.ini @@ -17,10 +17,12 @@ PLG_SCHEMAORG_BLOGPOSTING_FIELD_GENERIC_VALUE_LABEL="Value" PLG_SCHEMAORG_BLOGPOSTING_FIELD_HEADLINE_LABEL="Headline" PLG_SCHEMAORG_BLOGPOSTING_FIELD_IMAGE_LABEL="Image" PLG_SCHEMAORG_BLOGPOSTING_FIELD_LOCALITY_LABEL="Locality" +PLG_SCHEMAORG_BLOGPOSTING_FIELD_LOGO_LABEL="Logo" PLG_SCHEMAORG_BLOGPOSTING_FIELD_NAME_LABEL="Name" PLG_SCHEMAORG_BLOGPOSTING_FIELD_ORGANIZATION_LABEL="Organization" PLG_SCHEMAORG_BLOGPOSTING_FIELD_PERSON_LABEL="Person" PLG_SCHEMAORG_BLOGPOSTING_FIELD_POSTAL_CODE_LABEL="Postal Code" PLG_SCHEMAORG_BLOGPOSTING_FIELD_STREET_ADDRESS_LABEL="Street Address" +PLG_SCHEMAORG_BLOGPOSTING_FIELD_TYPE_LABEL="Type" PLG_SCHEMAORG_BLOGPOSTING_FIELD_URL_LABEL="Url" PLG_SCHEMAORG_BLOGPOSTING_XML_DESCRIPTION="Adds Blog as a new schema type in existing schemas." diff --git a/administrator/language/en-GB/plg_schemaorg_book.ini b/administrator/language/en-GB/plg_schemaorg_book.ini index 0302a26bd60d..734c898f2987 100755 --- a/administrator/language/en-GB/plg_schemaorg_book.ini +++ b/administrator/language/en-GB/plg_schemaorg_book.ini @@ -20,9 +20,9 @@ PLG_SCHEMAORG_BOOK_FIELD_GENERIC_VALUE_LABEL="Value" PLG_SCHEMAORG_BOOK_FIELD_GRAPHIC_NOVEL="Graphic Novel" PLG_SCHEMAORG_BOOK_FIELD_HARDCOVER_LABEL="Hardcover" PLG_SCHEMAORG_BOOK_FIELD_ILLUSTRATOR_LABEL="Illustrator" +PLG_SCHEMAORG_BOOK_FIELD_ILLUSTRATOR_NAME_LABEL="Name" PLG_SCHEMAORG_BOOK_FIELD_ISBN_LABEL="ISBN" PLG_SCHEMAORG_BOOK_FIELD_LOCALITY_LABEL="Locality" -PLG_SCHEMAORG_BOOK_FIELD_NAME_LABEL="Name" PLG_SCHEMAORG_BOOK_FIELD_NAME_LABEL="Title" PLG_SCHEMAORG_BOOK_FIELD_NUMBER_OF_PAGES_LABEL="Number of Pages" PLG_SCHEMAORG_BOOK_FIELD_PAPERBACK_LABEL="Paperback" diff --git a/administrator/language/en-GB/plg_schemaorg_event.ini b/administrator/language/en-GB/plg_schemaorg_event.ini index 79facc701fb5..2545a1343299 100755 --- a/administrator/language/en-GB/plg_schemaorg_event.ini +++ b/administrator/language/en-GB/plg_schemaorg_event.ini @@ -15,14 +15,18 @@ PLG_SCHEMAORG_EVENT_FIELD_GENERIC_VALUE_LABEL="Value" PLG_SCHEMAORG_EVENT_FIELD_IMAGE_LABEL="Image" PLG_SCHEMAORG_EVENT_FIELD_LOCALITY_LABEL="Locality" PLG_SCHEMAORG_EVENT_FIELD_LOCATION_LABEL="Location" +PLG_SCHEMAORG_EVENT_FIELD_LOCATION_NAME_LABEL="Name" +PLG_SCHEMAORG_EVENT_FIELD_LOGO_LABEL="Logo" PLG_SCHEMAORG_EVENT_FIELD_NAME_LABEL="Name" PLG_SCHEMAORG_EVENT_FIELD_ORGANIZATION_LABEL="Organization" PLG_SCHEMAORG_EVENT_FIELD_ORGANIZER_LABEL="Organizer" +PLG_SCHEMAORG_EVENT_FIELD_ORGANIZER_NAME_LABEL="Name" PLG_SCHEMAORG_EVENT_FIELD_PERSON_LABEL="Person" PLG_SCHEMAORG_EVENT_FIELD_POSTAL_CODE_LABEL="Postal Code" PLG_SCHEMAORG_EVENT_FIELD_RATING_VALUE_LABEL="Rating Value" PLG_SCHEMAORG_EVENT_FIELD_REVIEW_COUNT_LABEL="Review Count" PLG_SCHEMAORG_EVENT_FIELD_START_DATE_LABEL="Start Date" PLG_SCHEMAORG_EVENT_FIELD_STREET_ADDRESS_LABEL="Street Address" +PLG_SCHEMAORG_EVENT_FIELD_TYPE_LABEL="Type" PLG_SCHEMAORG_EVENT_FIELD_URL_LABEL="Url" PLG_SCHEMAORG_EVENT_XML_DESCRIPTION="Adds Event as a new schema type in existing schemas." diff --git a/administrator/language/en-GB/plg_schemaorg_jobposting.ini b/administrator/language/en-GB/plg_schemaorg_jobposting.ini index cc1721ee0768..d8a5af3989e5 100755 --- a/administrator/language/en-GB/plg_schemaorg_jobposting.ini +++ b/administrator/language/en-GB/plg_schemaorg_jobposting.ini @@ -10,13 +10,23 @@ PLG_SCHEMAORG_JOBPOSTING_FIELD_ADDRESS_REGION_LABEL="Region" PLG_SCHEMAORG_JOBPOSTING_FIELD_APPLICANT_LOCATION_REQUIREMENT_COUNTRY_LABEL="Country" PLG_SCHEMAORG_JOBPOSTING_FIELD_APPLICANT_LOCATION_REQUIREMENT_LABEL="Applicant Location Requirement" PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_LABEL="Base Salary" +PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_DAY="Day" +PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_HOUR="Hour" +PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_MONTH="Month" +PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_WEEK="Week" +PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_YEAR="Year" PLG_SCHEMAORG_JOBPOSTING_FIELD_CURRENCY_LABEL="Currency" PLG_SCHEMAORG_JOBPOSTING_FIELD_DATE_LABEL="Date" PLG_SCHEMAORG_JOBPOSTING_FIELD_DATEPOSTED_LABEL="Date Posted" PLG_SCHEMAORG_JOBPOSTING_FIELD_DESCRIPTION_LABEL="Description" PLG_SCHEMAORG_JOBPOSTING_FIELD_EMAIL_LABEL="Email" PLG_SCHEMAORG_JOBPOSTING_FIELD_EMPLOYMENTTYPE_LABEL="Employment Type" +PLG_SCHEMAORG_JOBPOSTING_FIELD_GENERIC_FIELD_LABEL="Generic Field" +PLG_SCHEMAORG_JOBPOSTING_FIELD_GENERIC_TITLE_LABEL="Title" +PLG_SCHEMAORG_JOBPOSTING_FIELD_GENERIC_VALUE_LABEL="Value" PLG_SCHEMAORG_JOBPOSTING_FIELD_HIRINGORGANIZATION_LABEL="Hiring Organization" +PLG_SCHEMAORG_JOBPOSTING_FIELD_HIRINGORGANIZATION_NAME_LABEL="Title" +PLG_SCHEMAORG_JOBPOSTING_FIELD_HIRINGORGANIZATION_TYPE_LABEL="Type" PLG_SCHEMAORG_JOBPOSTING_FIELD_HYBRID_LABEL="Hybrid" PLG_SCHEMAORG_JOBPOSTING_FIELD_IDENTIFIER_LABEL="Identifier" PLG_SCHEMAORG_JOBPOSTING_FIELD_IMAGE_LABEL="Logo" @@ -24,7 +34,9 @@ PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBLOCATION_LABEL="Job Location" PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBLOCATIONTYPE_LABEL="Description of the Job Location" PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_DATE_LABEL="Date" PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_LABEL="Date to Start" +PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_TEXT_HINT="ASAP" PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_TEXT_LABEL="Text" +PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_TYPE_LABEL="Type" PLG_SCHEMAORG_JOBPOSTING_FIELD_LOCALITY_LABEL="Locality" PLG_SCHEMAORG_JOBPOSTING_FIELD_MAXVALUE_LABEL="Maximum" PLG_SCHEMAORG_JOBPOSTING_FIELD_MINVALUE_LABEL="Minimum" diff --git a/administrator/language/en-GB/plg_schemaorg_recipe.ini b/administrator/language/en-GB/plg_schemaorg_recipe.ini index b9005a3c60ca..1124f6b9227e 100755 --- a/administrator/language/en-GB/plg_schemaorg_recipe.ini +++ b/administrator/language/en-GB/plg_schemaorg_recipe.ini @@ -25,6 +25,7 @@ PLG_SCHEMAORG_RECIPE_FIELD_INGREDIENTS_LABEL="Ingredients" PLG_SCHEMAORG_RECIPE_FIELD_INSTRUCTIONS_LABEL="Instructions" PLG_SCHEMAORG_RECIPE_FIELD_MINUTE_LABEL="Minutes" PLG_SCHEMAORG_RECIPE_FIELD_NAME_LABEL="Title" +PLG_SCHEMAORG_RECIPE_FIELD_NUTRITION_LABEL="Nutrition" PLG_SCHEMAORG_RECIPE_FIELD_PREPARATION_TIME_LABEL="Preparation Time" PLG_SCHEMAORG_RECIPE_FIELD_PROTEIN_LABEL="Protein" PLG_SCHEMAORG_RECIPE_FIELD_SATURATED_FAT_LABEL="Saturated Fat" diff --git a/plugins/schemaorg/blogposting/forms/schemaorg.xml b/plugins/schemaorg/blogposting/forms/schemaorg.xml index 9e2e8a77514f..a4e875c4ef35 100755 --- a/plugins/schemaorg/blogposting/forms/schemaorg.xml +++ b/plugins/schemaorg/blogposting/forms/schemaorg.xml @@ -56,7 +56,7 @@ PLG_SCHEMAORG_BLOGPOSTING_FIELD_PERSON_LABEL @@ -81,7 +81,7 @@

diff --git a/plugins/schemaorg/book/forms/schemaorg.xml b/plugins/schemaorg/book/forms/schemaorg.xml index 9ed5e1c00281..7b882fabf5d8 100755 --- a/plugins/schemaorg/book/forms/schemaorg.xml +++ b/plugins/schemaorg/book/forms/schemaorg.xml @@ -58,9 +58,9 @@ label="PLG_SCHEMAORG_BOOK_FIELD_ABRIDGED_LABEL" default="0" > - None - True - False + JNONE + JYES + JNO - None - PLG_SCHEMAORG_BOOK_FIELD_AUDIOBOOK_LABEL - PLG_SCHEMAORG_BOOK_FIELD_E_BOOK_LABEL - PLG_SCHEMAORG_BOOK_FIELD_GRAPHIC_NOVEL - PLG_SCHEMAORG_BOOK_FIELD_HARDCOVER_LABEL - PLG_SCHEMAORG_BOOK_FIELD_PAPERBACK_LABEL + JNONE + PLG_SCHEMAORG_BOOK_FIELD_AUDIOBOOK_LABEL + PLG_SCHEMAORG_BOOK_FIELD_E_BOOK_LABEL + PLG_SCHEMAORG_BOOK_FIELD_GRAPHIC_NOVEL + PLG_SCHEMAORG_BOOK_FIELD_HARDCOVER_LABEL + PLG_SCHEMAORG_BOOK_FIELD_PAPERBACK_LABEL diff --git a/plugins/schemaorg/event/forms/schemaorg.xml b/plugins/schemaorg/event/forms/schemaorg.xml index a0abb1a43d54..937bb813936c 100755 --- a/plugins/schemaorg/event/forms/schemaorg.xml +++ b/plugins/schemaorg/event/forms/schemaorg.xml @@ -100,7 +100,7 @@ PLG_SCHEMAORG_EVENT_FIELD_PERSON_LABEL @@ -160,7 +160,7 @@ @@ -175,7 +175,7 @@ diff --git a/plugins/schemaorg/jobposting/forms/schemaorg.xml b/plugins/schemaorg/jobposting/forms/schemaorg.xml index 2c1c554e0260..5ad64f2b951e 100755 --- a/plugins/schemaorg/jobposting/forms/schemaorg.xml +++ b/plugins/schemaorg/jobposting/forms/schemaorg.xml @@ -143,7 +143,7 @@ PLG_SCHEMAORG_JOBPOSTING_FIELD_TEXT_LABEL @@ -167,7 +167,7 @@ type="text" label="PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_TEXT_LABEL" filter="string" - hint="ASAP" + hint="PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_TEXT_HINT" showon="@type:text" /> @@ -182,7 +182,7 @@ PLG_SCHEMAORG_JOBPOSTING_FIELD_PERSON_LABEL @@ -192,7 +192,7 @@ @@ -396,11 +396,11 @@ label="PLG_SCHEMAORG_JOBPOSTING_FIELD_UNITTEXT_LABEL" > - HOUR - DAY - WEEK - MONTH - YEAR + PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_HOUR + PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_DAY + PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_WEEK + PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_MONTH + PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_YEAR @@ -412,7 +412,7 @@

@@ -421,14 +421,14 @@ type="text" filter="string" size="30" - label="PLG_SCHEMAORG_BOOK_FIELD_GENERIC_TITLE_LABEL" + label="PLG_SCHEMAORG_JOBPOSTING_FIELD_GENERIC_TITLE_LABEL" /> diff --git a/plugins/schemaorg/recipe/forms/schemaorg.xml b/plugins/schemaorg/recipe/forms/schemaorg.xml index fd42d4302aeb..6266cebce785 100755 --- a/plugins/schemaorg/recipe/forms/schemaorg.xml +++ b/plugins/schemaorg/recipe/forms/schemaorg.xml @@ -141,7 +141,7 @@

```