Change wording of Directory to Folder for user-visible strings
ClosedPublic

Authored by schwarzer on Apr 23 2016, 7:10 PM.

Details

Summary

In KDE we usually use the term "folder" for the file system unit. So I changed all user-visible occurences if "directory" to "folder".

Diff Detail

Repository
R167 Krusader
Lint
Lint Skipped
Unit
Unit Tests Skipped
schwarzer updated this revision to Diff 3484.Apr 23 2016, 7:10 PM
schwarzer retitled this revision from to Change wording of Directory to Folder for user-visible strings.
schwarzer updated this object.
schwarzer edited the test plan for this revision. (Show Details)
schwarzer added a reviewer: gengisdave.
schwarzer set the repository for this revision to R167 Krusader.
schwarzer added a project: Krusader.
asensi accepted this revision.Apr 24 2016, 6:39 PM
asensi added a reviewer: asensi.
This revision is now accepted and ready to land.Apr 24 2016, 6:39 PM
martinkostolny accepted this revision.Apr 25 2016, 10:09 PM
martinkostolny edited edge metadata.

OK.

Since I'm quite new to translation workflow, I just want to ask: is there a way to fix Krusader translations after this change? I'm not sure where they are stored, but I believe they are in different KDE "l10n" repo...

Not sure what you mean by "fix".
Usually translators (me included) fix their translations and then on your next release you fetch those translations.

BTW: GCC6 warns about misleading "if" indentation in:
krusader/VFS/virtualcopyjob.cpp:261
krusader/DiskUsage/diskusage.cpp:330
and
krusader/DiskUsage/diskusage.cpp:710

Since I do not have insight into the code base, maybe someone of you could take a look and set some brackets. :)

ad translations: thanks for info, that's what I wanted to know.
ad identations: I'll take a look into it, thanks! Personally I'm up for adding curly braces for every single if block even if it contains only one line. How about following https://community.kde.org/Policies/Kdelibs_Coding_Style ?

schwarzer closed this revision.EditedApr 26 2016, 9:34 AM

I think it's a good idea to folow the kdelibs coding guidelines closely. You are not kdelibs however, so you can define your own rules.

In this case you can either use braces or unindent the second line after the if statement.

In case you are interested in using braces everywhere (after sorting out the misleading indentation), you can use

clang-tidy -checks="readability-braces-around-statements" *.cpp -fix

to do it for you. It's not always beautiful but it spares you the searching. :)

I also use clang-format to enforce the style I chose.
https://github.com/fschwarzer/clang-format-file
I think it's not completely kdelibs-compliant, but it comes close. If you find something in there that can be made more kdelibs style, please consider creating a pull request to my repo so I can get the fix as well. :)

I am now closing this Diff, since I committed the change yesterday.

Thanks a lot for this useful info and guidance! :)