Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.3] Fix untranslated constants in script.php #41734

Merged
merged 2 commits into from
Sep 13, 2023

Conversation

Fedik
Copy link
Member

@Fedik Fedik commented Sep 13, 2023

Pull Request for Issue # .

Summary of Changes

Follow up for #41367
Replace untranslated constants to text

Testing Instructions

Code review,
Or do Test 7 from @richard67 instruction #41367 (comment)

Actual result BEFORE applying this Pull Request

Untranslated lang constant

Expected result AFTER applying this Pull Request

A fixed text

Link to documentations

Please select:

  • Documentation link for docs.joomla.org:
  • No documentation changes for docs.joomla.org needed
  • Pull Request link for manual.joomla.org:
  • No documentation changes for manual.joomla.org needed

@richard67
Copy link
Member

@Fedik As the 2 language strings "FILES_JOOMLA_ERROR_MANIFEST" and "FILES_JOOMLA_ERROR_FILE_FOLDER" will not be used anymore with your PR, could you deprecate them in file "language/en-GB/files_joomla.sys.ini"?

@Fedik
Copy link
Member Author

Fedik commented Sep 13, 2023

How that need to be done?
tbh I have no idea how to deprecate a text strings 😉

@richard67
Copy link
Member

How that need to be done? tbh I have no idea how to deprecate a text strings 😉

@Fedik You move the strings to the end and add a comment about deprecation before them, like you can see it here in 5.0-dev: https://github.com/joomla/joomla-cms/blob/5.0-dev/administrator/language/en-GB/plg_system_privacyconsent.ini#L29-L44

For the "language/en-GB/files_joomla.sys.ini" it would result in following content:

; Joomla! Project
; (C) 2010 Open Source Matters, Inc. <https://www.joomla.org>
; License GNU General Public License version 2 or later; see LICENSE.txt
; Note : All ini files need to be saved as UTF-8

FILES_JOOMLA="Joomla CMS"
FILES_JOOMLA_XML_DESCRIPTION="Joomla! 4 Content Management System."

; All the following strings are deprecated and will be removed with 6.0
FILES_JOOMLA_ERROR_FILE_FOLDER="Error on deleting file or folder %s"
FILES_JOOMLA_ERROR_MANIFEST="Error on updating manifest cache: (type, element, folder, client) = (%s, %s, %s, %s)"

@HLeithner Would it also need to add the language string deprecation to some developer documentation?

@joomla-cms-bot joomla-cms-bot added the Language Change This is for Translators label Sep 13, 2023
@Fedik
Copy link
Member Author

Fedik commented Sep 13, 2023

Done

@richard67
Copy link
Member

I have tested this item ✅ successfully on ca14692


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/41734.

1 similar comment
@tecpromotion
Copy link
Contributor

I have tested this item ✅ successfully on ca14692


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/41734.

@richard67 richard67 removed the Language Change This is for Translators label Sep 13, 2023
@richard67
Copy link
Member

RTC


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/41734.

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Sep 13, 2023
@richard67 richard67 added the Language Change This is for Translators label Sep 13, 2023
@obuisard obuisard added this to the Joomla! 4.3.5 milestone Sep 13, 2023
@obuisard obuisard merged commit d374945 into joomla:4.3-dev Sep 13, 2023
@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Sep 13, 2023
@obuisard
Copy link
Contributor

Thank you Fedir @Fedik

@Fedik Fedik deleted the fix-script-string branch September 13, 2023 13:46
HLeithner added a commit that referenced this pull request Sep 19, 2023
* [4.4] Upmerge (#41733)

* [4.3] fix localised cli installation (#41706)

* [4.3] Work around a successful upgrade with silent errors (#41367)

* Log all

* Capture errors

* Log messages

* Error collector

* Error collector

* More error collecting

* More error collecting

* Show errors

* Cli command check errors

* phpcs

* phpcs

* Back button and better text

* phpcs

* logs

* Make sure logging is working before continue

* Apply suggestions from code review

---------

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Harald Leithner <leithner@itronic.at>

* cs

---------

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: Fedir Zinchuk <getthesite@gmail.com>
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

* [4.3] Fix untranslated constants in script.php (#41734)

* restrict choicesjs input on container (#41478)

* [4.4] Add Joomla 5 compat plugin to 4.4.0 to fix class "JPlugin" not found error on update to 5 (#41738)

* Add J5 compat plugin to 4.4.0

* Adapt provider.php to latest changes in 5.0-dev

* Add to ExtensionsHelper

* Use protected = 0

* Better XML description.

* Use correct creationDate in XML file

Co-authored-by: Brian Teeman <brian@teeman.net>

---------

Co-authored-by: Brian Teeman <brian@teeman.net>

* [4.4] Smart Search: Limiting highlighting of tokens (#41463)

* Smart Search: Limiting highlighting of tokens

* Update components/com_finder/tmpl/search/default_results.php

Co-authored-by: Quy <quy@nomonkeybiz.com>

* Adding inline help text

---------

Co-authored-by: Quy <quy@nomonkeybiz.com>
Co-authored-by: Olivier Buisard <olivier.buisard@simplifyyourweb.com>
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
Co-authored-by: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com>

* No longer a code owner

build.xml is part of the testing team stuff and the rest I’m removing myself from

* Fields is maintained by everybody now

* Invalid import from upmerge

* Set the configuration options through a command (#41787)

* Set the configuration options through a command

* cs

* PHP 8.2 Creation of dynamic property (#41554)

* Fix deprecated message in categories (#41587)

* [4.3] fix finder common words (#41468)

* [4.3] Fix missing filter for subject (#41726)

* Fixed database upmerge conflicts

* Update installation/sql/mysql/base.sql

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

---------

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: Fedir Zinchuk <getthesite@gmail.com>
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Magnus Singer <work@magnus-singer.com>
Co-authored-by: Brian Teeman <brian@teeman.net>
Co-authored-by: Hannes Papenberg <info@joomlager.de>
Co-authored-by: Quy <quy@nomonkeybiz.com>
Co-authored-by: Olivier Buisard <olivier.buisard@simplifyyourweb.com>
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
Co-authored-by: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com>
Co-authored-by: George Wilson <georgejameswilson@googlemail.com>
Co-authored-by: Denitz <197527+Denitz@users.noreply.github.com>
Co-authored-by: Christiane Maier-Stadtherr <dev@chmst.de>
heelc29 added a commit to heelc29/joomla-cms that referenced this pull request Sep 19, 2023
HLeithner pushed a commit that referenced this pull request Sep 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Language Change This is for Translators
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants