Skip to content

Use locale-aware sort for menu entries #34

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.

Sign up for GitHub

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

Open
City-busz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use locale-aware sort for menu entries #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/xdgmenumaker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import os
import sys
import getopt
import fnmatch
import locale
import xdg.DesktopEntry as dentry
import xdg.Exceptions as exc
import xdg.BaseDirectory as bd
Expand Down Expand Up @@ -431,7 +432,10 @@ def sortedcategories(applist):
categories = []
for e in applist:
categories.append(e.category)
categories = sorted(set(categories))
categories = sorted(
set(categories),
key=lambda category: locale.strxfrm(category.decode())
)
return categories


Expand Down Expand Up @@ -485,7 +489,13 @@ def menu(ico_paths=True):
except exc.ParsingError:
pass

sortedapplist = sorted(applist, key=attrgetter('category', 'app.name'))
sortedapplist = sorted(
applist,
key=lambda entry: (
locale.strxfrm(entry.category.decode()),
locale.strxfrm(entry.app.name.decode()),
)
)

menu = []
for c in sortedcategories(applist):
Expand Down Expand Up @@ -925,4 +935,5 @@ def openbox():


if __name__ == "__main__":
locale.setlocale(locale.LC_COLLATE, '')
main(sys.argv[1:])