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

Fixed the "decending" typo. #91

Merged
merged 2 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion assets/romfs/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Alphabetical (Star)": "Alphabetisch (Favoriten)",
"Likes": "Likes",
"ID": "ID",
"Decending": "Absteigend",
"Descending": "Absteigend",
"Descending (down)": "Absteigend",
"Desc": "Abst.",
"Ascending": "Aufsteigend",
Expand Down
2 changes: 1 addition & 1 deletion assets/romfs/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Alphabetical (Star)": "Alphabetical (Star)",
"Likes": "Likes",
"ID": "ID",
"Decending": "Decending",
"Descending": "Descending",
"Descending (down)": "Descending (down)",
"Desc": "Desc",
"Ascending": "Ascending",
Expand Down
2 changes: 1 addition & 1 deletion assets/romfs/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Alphabetical (Star)": "Alfabético (favorito)",
"Likes": "Me Gusta",
"ID": "ID",
"Decending": "Descendente",
"Descending": "Descendente",
"Descending (down)": "Descendente (abajo)",
"Desc": "Descendente",
"Ascending": "Ascendente",
Expand Down
2 changes: 1 addition & 1 deletion assets/romfs/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Alphabetical (Star)": "Alphabétique (Favories)",
"Likes": "Likes",
"ID": "ID",
"Decending": "Décroissant",
"Descending": "Décroissant",
"Descending (down)": "Décroissant",
"Desc": "Décroissant",
"Ascending": "Croissant",
Expand Down
2 changes: 1 addition & 1 deletion assets/romfs/i18n/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Alphabetical (Star)": "Alfabetico (Preferiti)",
"Likes": "Mi Piace",
"ID": "ID",
"Decending": "Decrescente",
"Descending": "Decrescente",
"Descending (down)": "Decrescente",
"Desc": "Decrescente",
"Ascending": "Crescente",
Expand Down
2 changes: 1 addition & 1 deletion assets/romfs/i18n/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Alphabetical (Star)": "アルファベット順(お気に入り)",
"Likes": "いいね順",
"ID": "デベロッパー順",
"Decending": "降順",
"Descending": "降順",
"Descending (down)": "降順",
"Desc": "降順",
"Ascending": "上昇",
Expand Down
2 changes: 1 addition & 1 deletion assets/romfs/i18n/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Alphabetical (Star)": "알파벳순 (즐겨찾기)",
"Likes": "좋아요순",
"ID": "ID순",
"Decending": "내림차순",
"Descending": "내림차순",
"Descending (down)": "내림차순",
"Desc": "내림차순",
"Ascending": "오름차순",
Expand Down
2 changes: 1 addition & 1 deletion assets/romfs/i18n/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Alphabetical (Star)": "",
"Likes": "",
"ID": "",
"Decending": "Aflopend",
"Descending": "Aflopend",
"Descending (down)": "Aflopend",
"Desc": "Aflopend",
"Ascending": "Oplopend",
Expand Down
2 changes: 1 addition & 1 deletion assets/romfs/i18n/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Alphabetical (Star)": "Ordem alfabética (favoritos)",
"Likes": "Nº de curtidas",
"ID": "ID",
"Decending": "Decrescente",
"Descending": "Decrescente",
"Descending (down)": "Decrescente (baixo)",
"Desc": "Decr.",
"Ascending": "Ascendente",
Expand Down
2 changes: 1 addition & 1 deletion assets/romfs/i18n/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Alphabetical (Star)": "",
"Likes": "",
"ID": "",
"Decending": "По убыванию",
"Descending": "По убыванию",
"Descending (down)": "По убыванию",
"Desc": "По убыванию",
"Ascending": "По возрастанию",
Expand Down
2 changes: 1 addition & 1 deletion assets/romfs/i18n/se.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Alphabetical (Star)": "Alfabetisk (Stjärna)",
"Likes": "Gillar",
"ID": "ID",
"Decending": "Fallande",
"Descending": "Fallande",
"Descending (down)": "Fallande (nedåt)",
"Desc": "Fall",
"Ascending": "Stigande",
Expand Down
2 changes: 1 addition & 1 deletion assets/romfs/i18n/vi.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Alphabetical (Star)": "A-Z (Yêu thích)",
"Likes": "Thích",
"ID": "ID",
"Decending": "Giảm dần",
"Descending": "Giảm dần",
"Descending (down)": "Giảm dần (xuống)",
"Desc": "Giảm",
"Ascending": "Tăng dần",
Expand Down
2 changes: 1 addition & 1 deletion assets/romfs/i18n/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Alphabetical (Star)": "按字母顺序(星标优先)",
"Likes": "点赞量",
"ID": "ID",
"Decending": "降序",
"Descending": "降序",
"Descending (down)": "降序",
"Desc": "降序",
"Ascending": "升序",
Expand Down
4 changes: 2 additions & 2 deletions sphaira/include/ui/menus/appstore.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ enum SortType {
};

enum OrderType {
OrderType_Decending,
OrderType_Descending,
OrderType_Ascending,
};

Expand Down Expand Up @@ -199,7 +199,7 @@ struct Menu final : MenuBase {

Filter m_filter{Filter::Filter_All};
SortType m_sort{SortType::SortType_Updated};
OrderType m_order{OrderType::OrderType_Decending};
OrderType m_order{OrderType::OrderType_Descending};

s64 m_index{}; // where i am in the array
LazyImage m_default_image;
Expand Down
4 changes: 2 additions & 2 deletions sphaira/include/ui/menus/filebrowser.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ enum SortType {
};

enum OrderType {
OrderType_Decending,
OrderType_Descending,
OrderType_Ascending,
};

Expand Down Expand Up @@ -262,7 +262,7 @@ struct Menu final : MenuBase {
SelectedType m_selected_type{SelectedType::None};

option::OptionLong m_sort{INI_SECTION, "sort", SortType::SortType_Alphabetical};
option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Decending};
option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Descending};
option::OptionBool m_show_hidden{INI_SECTION, "show_hidden", false};
option::OptionBool m_folders_first{INI_SECTION, "folders_first", true};
option::OptionBool m_hidden_last{INI_SECTION, "hidden_last", false};
Expand Down
4 changes: 2 additions & 2 deletions sphaira/include/ui/menus/homebrew.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ enum SortType {
};

enum OrderType {
OrderType_Decending,
OrderType_Descending,
OrderType_Ascending,
};

Expand Down Expand Up @@ -55,7 +55,7 @@ struct Menu final : MenuBase {
std::unique_ptr<List> m_list;

option::OptionLong m_sort{INI_SECTION, "sort", SortType::SortType_AlphabeticalStar};
option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Decending};
option::OptionLong m_order{INI_SECTION, "order", OrderType::OrderType_Descending};
option::OptionBool m_hide_sphaira{INI_SECTION, "hide_sphaira", false};
};

Expand Down
10 changes: 5 additions & 5 deletions sphaira/source/ui/menus/appstore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@ Menu::Menu(const std::vector<NroEntry>& nro_entries) : MenuBase{"AppStore"_i18n}
sort_items.push_back("Alphabetical"_i18n);

SidebarEntryArray::Items order_items;
order_items.push_back("Decending"_i18n);
order_items.push_back("Descending"_i18n);
order_items.push_back("Ascending"_i18n);

options->Add(std::make_shared<SidebarEntryArray>("Filter"_i18n, filter_items, [this, filter_items](s64& index_out){
Expand Down Expand Up @@ -1298,7 +1298,7 @@ void Menu::Sort() {
case SortType_Updated: {
if (lhs.updated_num == rhs.updated_num) {
return strcasecmp(lhs.name.c_str(), rhs.name.c_str()) < 0;
} else if (m_order == OrderType_Decending) {
} else if (m_order == OrderType_Descending) {
return lhs.updated_num > rhs.updated_num;
} else {
return lhs.updated_num < rhs.updated_num;
Expand All @@ -1307,7 +1307,7 @@ void Menu::Sort() {
case SortType_Downloads: {
if (lhs.app_dls == rhs.app_dls) {
return strcasecmp(lhs.name.c_str(), rhs.name.c_str()) < 0;
} else if (m_order == OrderType_Decending) {
} else if (m_order == OrderType_Descending) {
return lhs.app_dls > rhs.app_dls;
} else {
return lhs.app_dls < rhs.app_dls;
Expand All @@ -1316,14 +1316,14 @@ void Menu::Sort() {
case SortType_Size: {
if (lhs.extracted == rhs.extracted) {
return strcasecmp(lhs.name.c_str(), rhs.name.c_str()) < 0;
} else if (m_order == OrderType_Decending) {
} else if (m_order == OrderType_Descending) {
return lhs.extracted > rhs.extracted;
} else {
return lhs.extracted < rhs.extracted;
}
} break;
case SortType_Alphabetical: {
if (m_order == OrderType_Decending) {
if (m_order == OrderType_Descending) {
return strcasecmp(lhs.name.c_str(), rhs.name.c_str()) < 0;
} else {
return strcasecmp(lhs.name.c_str(), rhs.name.c_str()) > 0;
Expand Down
6 changes: 3 additions & 3 deletions sphaira/source/ui/menus/filebrowser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ Menu::Menu(const std::vector<NroEntry>& nro_entries) : MenuBase{"FileBrowser"_i1
sort_items.push_back("Alphabetical"_i18n);

SidebarEntryArray::Items order_items;
order_items.push_back("Decending"_i18n);
order_items.push_back("Descending"_i18n);
order_items.push_back("Ascending"_i18n);

options->Add(std::make_shared<SidebarEntryArray>("Sort"_i18n, sort_items, [this](s64& index_out){
Expand Down Expand Up @@ -1034,14 +1034,14 @@ void Menu::Sort() {
case SortType_Size: {
if (lhs.file_size == rhs.file_size) {
return strncasecmp(lhs.name, rhs.name, sizeof(lhs.name)) < 0;
} else if (order == OrderType_Decending) {
} else if (order == OrderType_Descending) {
return lhs.file_size > rhs.file_size;
} else {
return lhs.file_size < rhs.file_size;
}
} break;
case SortType_Alphabetical: {
if (order == OrderType_Decending) {
if (order == OrderType_Descending) {
return strncasecmp(lhs.name, rhs.name, sizeof(lhs.name)) < 0;
} else {
return strncasecmp(lhs.name, rhs.name, sizeof(lhs.name)) > 0;
Expand Down
8 changes: 4 additions & 4 deletions sphaira/source/ui/menus/homebrew.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Menu::Menu() : MenuBase{"Homebrew"_i18n} {
sort_items.push_back("Size (Star)"_i18n);

SidebarEntryArray::Items order_items;
order_items.push_back("Decending"_i18n);
order_items.push_back("Descending"_i18n);
order_items.push_back("Ascending"_i18n);

options->Add(std::make_shared<SidebarEntryArray>("Sort"_i18n, sort_items, [this, sort_items](s64& index_out){
Expand Down Expand Up @@ -337,7 +337,7 @@ void Menu::Sort() {
}
}

if (order == OrderType_Decending) {
if (order == OrderType_Descending) {
return r < 0;
} else {
return r > 0;
Expand All @@ -363,7 +363,7 @@ void Menu::Sort() {

if (lhs_timestamp == rhs_timestamp) {
return name_cmp(lhs, rhs);
} else if (order == OrderType_Decending) {
} else if (order == OrderType_Descending) {
return lhs_timestamp > rhs_timestamp;
} else {
return lhs_timestamp < rhs_timestamp;
Expand All @@ -379,7 +379,7 @@ void Menu::Sort() {
case SortType_Size: {
if (lhs.size == rhs.size) {
return name_cmp(lhs, rhs);
} else if (order == OrderType_Decending) {
} else if (order == OrderType_Descending) {
return lhs.size > rhs.size;
} else {
return lhs.size < rhs.size;
Expand Down
Loading