Sync v19 v20 #2810
Sync v19 v20 #2810
Conversation
github-actions
bot
added
Component: Catalog
|
every some time I've to say this, when will we get rid of v19? the differences aren't even that big to justify all the time put into fixing conflicts. |
|
Then better ged rid of v20. I diffed v19/v20 yesterday and found some changes that should be reverted (imho) to have less differences. Other could possibly backported, (Btw ... this should be merged to v20 too.) |
|
why do everybody hate v20? who needs ie8 and those iphone themes anymore? |
|
For me its not about IE support or themes. Just want to have as less differences as possible. |
|
if we have zero differences is way better |
|
Then we dont need v20 at all :P |
|
if we backport everything v19 will be v20 |
|
Actually we cant backport everything (in one step). Think there are some changes that need reviews. |
|
git merge 20.0... :-D I think some of the other maintainers won't be happy |
| @@ -642,7 +642,7 @@ public function validateUploadFile($filePath) | |||
| } | |||
|
|
|||
| if ($imageInfo[0] > $maxDimension || $imageInfo[1] > $maxDimension) { | |||
| Mage::throwException($this->__('Disalollowed file format.')); | |||
There was a problem hiding this comment.
this probably breaks several translations and should have only get changed in the translation file
There was a problem hiding this comment.
I've been arguing for the same thing for long time and I was alone saying that we should only update the translation files. At that time literally everybody was against my (and now your) idea. So please be more vocal next time. The people decided that they want to keep in sync strings in php files and in CSV files so now it is what it is.
There was a problem hiding this comment.
In that line it is about an exception that will be written in a log file. I think that these errors can be corrected in the PHP files and if they exist (although I doubt it) in the CSV files too. A programmer should know English, as well as a system administrator who has access to these files. On the other hand, although I do not agree to modify only the CSV files, I accepted PRs where such modifications were made, because it is for user interface and we should take care of translation without requiring efforts from those who periodically update the source code..
There are discussions on this topic in which the administrator takes note of the changes from one version to another and he makes the translations. From the programmer's perspective, honestly speaking, I don't like to see inconsistencies between sentences, especially when I look into the source code. I see something in the interface in English then in the code it's completely different or worse spelling mistakes like the one above, extremely annoying.
There was a problem hiding this comment.
The important thing is that we do not keep discussing the same things over and over again. I'm fine with the decision taken although it was not the choice I'd love, sometime it's a personal taste and it is fine :-)
There was a problem hiding this comment.
- i always said change only translation string in csv
- @Flyingmana this PR was just to get rid of differences between branches. If we change it back, we should also revert in v20.
|
@sreichel @fballiano if you want a change in supported versions: here is the place to contribute them OpenMage/rfcs#7 |
Flyingmana
added
the
backwards compatibility
Description (*)
Some minor changes to reduce differences ... (marked same methods as deprecated).
Contribution checklist (*)