Skip to content

Add method for loading available languages found in only on directory #7

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
tobbi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add method for loading available languages found in only on directory #7

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions include/tinygettext/dictionary_manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ class DictionaryManager
/** Return a set of the available languages in their country code */
std::set<Language> get_languages();

/** Return a set of the available languages in their country code, found in the specified directory */
std::set<Language> get_languages(const std::string& directory);

std::string convertFilename2Language(const std::string &s_in) const;

private:
Expand Down
27 changes: 21 additions & 6 deletions src/dictionary_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,14 +189,29 @@ DictionaryManager::get_languages()

for (SearchPath::iterator p = search_path.begin(); p != search_path.end(); ++p)
{
std::vector<std::string> files = filesystem->open_directory(*p);
for (const auto& language : get_languages(*p))
{
languages.insert(language);
}
}
return languages;
}

std::set<Language>
DictionaryManager::get_languages(const std::string& directory)
{
if (std::find(search_path.begin(), search_path.end(), directory) == search_path.end()) {
return std::set<Language>();
}

std::set<Language> languages;
std::vector<std::string> files = filesystem->open_directory(directory);

for(std::vector<std::string>::iterator file = files.begin(); file != files.end(); ++file)
for(std::vector<std::string>::iterator file = files.begin(); file != files.end(); ++file)
{
if (has_suffix(*file, ".po"))
{
if (has_suffix(*file, ".po"))
{
languages.insert(Language::from_env(file->substr(0, file->size()-3)));
}
languages.insert(Language::from_env(file->substr(0, file->size()-3)));
}
}
return languages;
Expand Down