Please cherry-pick this commit:
git commit eabc25d70f00907ab5e67456e5efed136283da8d
The commit is:
I've put question marks in FreeCAD version contained in a message, that was to be put in after the code is merged. I'm filling it in.
I've done it in a way that the actual message is not changed, to not affect translations.
PS. I wonder, why github says "Sorry, diff information is unavailable." That's why I've attached a screenshot.
Fill in version in a sketch validator message
Forum rules
Be nice to others! Respect the FreeCAD code of conduct!
Be nice to others! Respect the FreeCAD code of conduct!
- DeepSOIC
- Veteran
- Posts: 7896
- Joined: Fri Aug 29, 2014 12:45 am
- Location: used to be Saint-Petersburg, Russia
Fill in version in a sketch validator message
- Attachments
-
- commit eabc25d70f00907ab5e67456e5efed136283da8d.png (132.3 KiB) Viewed 3741 times
Re: Fill in version in a sketch validator message
The 0.15 is translated and the 4585 is not translated? Sounds not very useful to me. If the string will never change again, it can be included in the translation. In the long run i want to search for (exact) error messages in the source code (and ts-files).DeepSOIC wrote:I've done it in a way that the actual message is not changed, to not affect translations.
Re: Fill in version in a sketch validator message
Also the "???" could be problematic. For the translator it's not obvious that the translated string must also have three question marks. In case he uses only one or two the message will be broken at runtime. You better have did it like this:
Code: Select all
"... in FreeCAD older than %3").arg(...).arg(...).arg(QString::fromLatin1(v0.15.4585))
Re: Fill in version in a sketch validator message
https://github.com/FreeCAD/FreeCAD_sf_m ... -squashed2DeepSOIC wrote:PS. I wonder, why github says "Sorry, diff information is unavailable."
Maybe because the branch is not properly rebased?
- DeepSOIC
- Veteran
- Posts: 7896
- Joined: Fri Aug 29, 2014 12:45 am
- Location: used to be Saint-Petersburg, Russia
Re: Fill in version in a sketch validator message
Then just type the version directly into the message.
- DeepSOIC
- Veteran
- Posts: 7896
- Joined: Fri Aug 29, 2014 12:45 am
- Location: used to be Saint-Petersburg, Russia
Re: Fill in version in a sketch validator message
I don't think so, since it doesn't stop other commits from being displayed. The branch is not rebased at all , I've just done this small change on top of the branch as it was for my previous pull request.shoogen wrote:https://github.com/FreeCAD/FreeCAD_sf_m ... -squashed2DeepSOIC wrote:PS. I wonder, why github says "Sorry, diff information is unavailable."
Maybe because the branch is not properly rebased?