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.0] Url Language Code is not a prefix #30440

Merged
merged 2 commits into from
Aug 21, 2020

Conversation

infograf768
Copy link
Member

Pull Request for Issue #30438

Summary of Changes

Reinstating 3.x value. Added back a description, although shorter than in 3.x

Testing Instructions

Patch and edit a Content Language.

Actual result BEFORE applying this Pull Request

screen shot 2020-08-21 at 10 17 16

Expected result AFTER applying this Pull Request

Screen Shot 2020-08-21 at 12 51 53

@MartijnMaandag

@@ -10,7 +10,8 @@ COM_LANGUAGES_ERR_NO_LANGUAGE_SELECTED="No language selected."
COM_LANGUAGES_ERROR_LANG_TAG="<br>The Language Tag should have 2 or 3 lowercase letters corresponding to the ISO language, a dash and 2 uppercase letters corresponding to the ISO country code. <br>This should be the exact prefix used for the language installed or to be installed. Example: en-GB, srp-ME."
COM_LANGUAGES_ERROR_LANGUAGE_METAFILE_MISSING="Could not load %s language meta XML file from %s."
COM_LANGUAGES_FIELD_IMAGE_LABEL="Image"
COM_LANGUAGES_FIELD_LANG_CODE_LABEL="URL Language Prefix"
COM_LANGUAGES_FIELD_LANG_CODE_DESC="This Language Code will be appended to the site URL. Note <em>the Language Code must be unique among all the languages</em>."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dont you mean domain name not url?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not as we ever seen it.
The domain name is and remains
mydomain.com
the url is modified to add the url language code after the domain name. mydomain.com/en/ thus making it part of the url.
It is specially obvious when using the parameter Remove URL Language Code in the language filter plugin.
In that case the url language code is not displayed at all.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are not appending it to the URL. That would be example.com/contact/fr

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also. When sef is off the url language code is added as &lang=en, far way from the domain name.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both scenarios have in common that it is added (not appended) to the url (once as path prefix and once as query parameter). Append to the url would mean it always ends up at the end of the url.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the 3.x string we have since multilang was implemented in J:

COM_LANGUAGES_FIELD_LANG_CODE_DESC="This Language Code will be appended to the site URL. When SEF is enabled, you will get https://example.com/en/. If SEF is disabled the suffix &lang=en will be appended at the end of the URL. Note the Language Code must be unique among all the languages."

I have no issue using another verb than « appended »

Copy link
Member Author

@infograf768 infograf768 Aug 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would « added in the site URLs » be acceptable?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From my point of view that would be correct (synonymous 'embedded' would also be possible). Nice to see that you made the text a lot shorter.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

" will be included in the site URL"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok for that. will do later.

@ChristineWk
Copy link

I have tested this item ✅ successfully on 57519bc


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

1 similar comment
@bonzani
Copy link

bonzani commented Aug 21, 2020

I have tested this item ✅ successfully on 57519bc


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

@infograf768
Copy link
Member Author

Please do not rtc until I modify the text.

@infograf768
Copy link
Member Author

RTC as the only change is for the description which is now

COM_LANGUAGES_FIELD_LANG_CODE_DESC="This Language Code will be included in the site URL. Note <em>the Language Code must be unique among all the languages</em>."


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

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Aug 21, 2020
@Quy Quy merged commit 90b0e1b into joomla:4.0-dev Aug 21, 2020
@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Aug 21, 2020
@Quy Quy added this to the Joomla 4.0 milestone Aug 21, 2020
@infograf768 infograf768 deleted the 4.0_languagecode_string branch August 21, 2020 18:23
drmenzelit pushed a commit to drmenzelit/joomla-cms that referenced this pull request Aug 31, 2020
* [4.0] URL LANGUAGE CODE is not a prefix

* modified desc as suggested
infograf768 added a commit that referenced this pull request Sep 4, 2020
* First step to make newsflash horizontal

* [4.0] Fix Alert double error display in Installation

* seperating multiple messages with border top

* Increase minimum length

* Fix meter displaying complete message prematurely

* Add strenthmeter attribute to installation

* Change meter values to display green when password requirements are met

* [4.0] {Cassiopea] Implementing Password length/meter

* [4.0] Fix Fieldset description display (#30435)

* [4.0] Url Language Code is not a prefix (#30440)

* [4.0] URL LANGUAGE CODE is not a prefix

* modified desc as suggested

* [4.0] Implementing display of fieldset descriptions for fieldset
children

* Taking off description

* scss cs

* use @Quy suggestion

* file cs

* [4.0] Media field fix (#30455)

* fix

* typo, (well nothing new)

* Allow media fields in subforms

- Cleanup Media field
- Expose initilazation method of Bootstrpa Modlas to a Joomla.Bootstrap object
- Initilise Modlas on the lifecycle of the Custom Element

* Paleolithic js mode only in the legacy…

* CS

* Proper check

* Pffff

* Update joomla-field-media.w-c.es6.js

* [4.0] Convert icon used for jgrid defaults to fas fa- (#30464)

* make icon-circle use fa-circle

* allows for including icon- in call

* move fa-fw to last class to fit convention (#30469)

* [4.0] Long labels wrapping (#30474)

When we have fields displayed in columns with the label displayed above the input there is a width limit of 240px on the label.

This results in long labels wrapping when it is not needed as the column is wider than 240px.

In english we dont see this is many places but the easiest is in the __configure edit screen_  fields

This simple PR changes the label width to 100% when the fields are displayed in columns like this.

As this is an scss change you will need to `node build.js --compile-css` in order to test

### Before

### After

* Fix mod_articles_latest (#30459)

* [4.0] Add a parameter for "back-to-top" button in Cassiopeia (#30441)

* [4.0] Add a parameter for back-to-top button in Cassiopeia

Added a parameter to show / hide the back-to-top button in Cassiopeia.
Currently the footer appears when a module has been published on position "footer". And the back-to-top only appears if the footer is visible. Since the footer is part of the grid, it is not easy to move the back-to-top outside the grid.

Now it is possible to decide to have a back-to-top or not. If yes, the footer will be rendered showing the button, independently if there is a module in the position footer.
It is also possible to show only modules (switch back-to-top off) or modules and back-to-top (switch on).

* Added smooth scrolling

Add smooth scrolling taking in account the preferences of the user (reduced motion).
Improve  language file.

* Correct height and position of back-to-top button

* Correct code style

* Correct code style 2

* Change smooth scrolling behavior to take in account reduced motion preferences

* Language file corrected, language string changed to match others

* Update language/en-GB/tpl_cassiopeia.ini

Link instead button

Co-authored-by: Brian Teeman <[email protected]>

* Update templates/cassiopeia/scss/blocks/_global.scss

Comment for smooth scroll

Co-authored-by: Brian Teeman <[email protected]>

Co-authored-by: Brian Teeman <[email protected]>

* fix improper family name. (#30481)

* [4.0] update helptoc (#30490)

* [4.0] update helptoc

Removes the string for the expired cache page that no longer exists and removes it from the index displayed on the left hand side in the help page

* api

* [4.0] Add new permissions-policy to the HTTPHeaders Plugin (#30491)

* add permissions-policy

* add Permissions-Policy to the dropdown

* alpha order

* [4.0] Error when changing status of tagged content items (#30466)

* Correct column name

* Fix changing UCM state

* [4.0] br tag (#30503)

* [4.0] br tag

In Joomla 4 we use `<br>` not `<br />`

* bad grep

* [4.0] Remove old search component (#30506)

* [4.0] Remove old search component

The regular search component is not in J4

This pr removes reference to it in the help system
`administrator/index.php?option=com_admin&view=help`

* revert

* [4.0] Help Dashboard (#30508)

* [4.0] Help Dashboard

This PR makes multiple changes to the help dashboard. In order of importance they are.

- Created a new section "Start Here"
- Moved "Joomla Help" to the "Start Here" section to give it greater priority as it really is the first place you should look for help
- Removed target=_blank from "Joomla Help"
- Moved "Documentation Wiki" from "Resources" to the top of "Additional Help"

* deduplicate

* compass icon

* Moved css for mod_articles_news to media folder

User webAsset Manager to load specific css for module

* Move web asset call to horizontal.php

Co-authored-by: Jean-Marie Simonet <[email protected]>
Co-authored-by: Quy <[email protected]>
Co-authored-by: dGrammatiko <[email protected]>
Co-authored-by: Bear <[email protected]>
Co-authored-by: Brian Teeman <[email protected]>
Co-authored-by: Christiane Maier-Stadtherr <[email protected]>
Co-authored-by: Tobias Zulauf <[email protected]>
Co-authored-by: SharkyKZ <[email protected]>
sakiss pushed a commit to sakiss/joomla-cms that referenced this pull request Oct 16, 2020
* [4.0] URL LANGUAGE CODE is not a prefix

* modified desc as suggested
sakiss pushed a commit to sakiss/joomla-cms that referenced this pull request Oct 16, 2020
* First step to make newsflash horizontal

* [4.0] Fix Alert double error display in Installation

* seperating multiple messages with border top

* Increase minimum length

* Fix meter displaying complete message prematurely

* Add strenthmeter attribute to installation

* Change meter values to display green when password requirements are met

* [4.0] {Cassiopea] Implementing Password length/meter

* [4.0] Fix Fieldset description display (joomla#30435)

* [4.0] Url Language Code is not a prefix (joomla#30440)

* [4.0] URL LANGUAGE CODE is not a prefix

* modified desc as suggested

* [4.0] Implementing display of fieldset descriptions for fieldset
children

* Taking off description

* scss cs

* use @Quy suggestion

* file cs

* [4.0] Media field fix (joomla#30455)

* fix

* typo, (well nothing new)

* Allow media fields in subforms

- Cleanup Media field
- Expose initilazation method of Bootstrpa Modlas to a Joomla.Bootstrap object
- Initilise Modlas on the lifecycle of the Custom Element

* Paleolithic js mode only in the legacy…

* CS

* Proper check

* Pffff

* Update joomla-field-media.w-c.es6.js

* [4.0] Convert icon used for jgrid defaults to fas fa- (joomla#30464)

* make icon-circle use fa-circle

* allows for including icon- in call

* move fa-fw to last class to fit convention (joomla#30469)

* [4.0] Long labels wrapping (joomla#30474)

When we have fields displayed in columns with the label displayed above the input there is a width limit of 240px on the label.

This results in long labels wrapping when it is not needed as the column is wider than 240px.

In english we dont see this is many places but the easiest is in the __configure edit screen_  fields

This simple PR changes the label width to 100% when the fields are displayed in columns like this.

As this is an scss change you will need to `node build.js --compile-css` in order to test

### Before

### After

* Fix mod_articles_latest (joomla#30459)

* [4.0] Add a parameter for "back-to-top" button in Cassiopeia (joomla#30441)

* [4.0] Add a parameter for back-to-top button in Cassiopeia

Added a parameter to show / hide the back-to-top button in Cassiopeia.
Currently the footer appears when a module has been published on position "footer". And the back-to-top only appears if the footer is visible. Since the footer is part of the grid, it is not easy to move the back-to-top outside the grid.

Now it is possible to decide to have a back-to-top or not. If yes, the footer will be rendered showing the button, independently if there is a module in the position footer.
It is also possible to show only modules (switch back-to-top off) or modules and back-to-top (switch on).

* Added smooth scrolling

Add smooth scrolling taking in account the preferences of the user (reduced motion).
Improve  language file.

* Correct height and position of back-to-top button

* Correct code style

* Correct code style 2

* Change smooth scrolling behavior to take in account reduced motion preferences

* Language file corrected, language string changed to match others

* Update language/en-GB/tpl_cassiopeia.ini

Link instead button

Co-authored-by: Brian Teeman <[email protected]>

* Update templates/cassiopeia/scss/blocks/_global.scss

Comment for smooth scroll

Co-authored-by: Brian Teeman <[email protected]>

Co-authored-by: Brian Teeman <[email protected]>

* fix improper family name. (joomla#30481)

* [4.0] update helptoc (joomla#30490)

* [4.0] update helptoc

Removes the string for the expired cache page that no longer exists and removes it from the index displayed on the left hand side in the help page

* api

* [4.0] Add new permissions-policy to the HTTPHeaders Plugin (joomla#30491)

* add permissions-policy

* add Permissions-Policy to the dropdown

* alpha order

* [4.0] Error when changing status of tagged content items (joomla#30466)

* Correct column name

* Fix changing UCM state

* [4.0] br tag (joomla#30503)

* [4.0] br tag

In Joomla 4 we use `<br>` not `<br />`

* bad grep

* [4.0] Remove old search component (joomla#30506)

* [4.0] Remove old search component

The regular search component is not in J4

This pr removes reference to it in the help system
`administrator/index.php?option=com_admin&view=help`

* revert

* [4.0] Help Dashboard (joomla#30508)

* [4.0] Help Dashboard

This PR makes multiple changes to the help dashboard. In order of importance they are.

- Created a new section "Start Here"
- Moved "Joomla Help" to the "Start Here" section to give it greater priority as it really is the first place you should look for help
- Removed target=_blank from "Joomla Help"
- Moved "Documentation Wiki" from "Resources" to the top of "Additional Help"

* deduplicate

* compass icon

* Moved css for mod_articles_news to media folder

User webAsset Manager to load specific css for module

* Move web asset call to horizontal.php

Co-authored-by: Jean-Marie Simonet <[email protected]>
Co-authored-by: Quy <[email protected]>
Co-authored-by: dGrammatiko <[email protected]>
Co-authored-by: Bear <[email protected]>
Co-authored-by: Brian Teeman <[email protected]>
Co-authored-by: Christiane Maier-Stadtherr <[email protected]>
Co-authored-by: Tobias Zulauf <[email protected]>
Co-authored-by: SharkyKZ <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants