napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Compare translation IDs, extend find()

Browse Source 
Allow naive comparison of translation IDs (e.g. "ca@valencia"
against other IDs) and make it easier to find one.
This commit is contained in:
Adriaan de Groot 2022-05-04 10:35:43 +02:00
parent 5307976179
commit 792c4914b0
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcalamares/locale/Translation.h
View File

@ -117,6 +117,11 @@ operator<<( QDebug& s, const Translation::Id& id )
{ {
return s << id.name; return s << id.name;
} }
static inline bool
operator==( const Translation::Id& lhs, const Translation::Id& rhs )
{
return lhs.name == rhs.name;
}
} // namespace Locale } // namespace Locale
} // namespace CalamaresUtils } // namespace CalamaresUtils

16
src/libcalamares/locale/TranslationsModel.cpp
View File

@ -103,13 +103,13 @@ TranslationsModel::find( std::function< bool( const Translation& ) > predicate )
int int
TranslationsModel::find( std::function< bool( const QLocale& ) > predicate ) const TranslationsModel::find( std::function< bool( const QLocale& ) > predicate ) const
{ {
return find( [&]( const Translation& l ) { return predicate( l.locale() ); } ); return find( [ & ]( const Translation& l ) { return predicate( l.locale() ); } );
} }
int int
TranslationsModel::find( const QLocale& locale ) const TranslationsModel::find( const QLocale& locale ) const
{ {
return find( [&]( const Translation& l ) { return locale == l.locale(); } ); return find( [ & ]( const Translation& l ) { return locale == l.locale(); } );
} }
int int
@ -121,13 +121,19 @@ TranslationsModel::find( const QString& countryCode ) const
} }
auto c_l = countryData( countryCode ); auto c_l = countryData( countryCode );
int r = find( int r = find( [ & ]( const Translation& l )
[&]( const Translation& l ) { return ( l.language() == c_l.second ) && ( l.country() == c_l.first ); } ); { return ( l.language() == c_l.second ) && ( l.country() == c_l.first ); } );
if ( r >= 0 ) if ( r >= 0 )
{ {
return r; return r;
} }
return find( [&]( const Translation& l ) { return l.language() == c_l.second; } ); return find( [ & ]( const Translation& l ) { return l.language() == c_l.second; } );
}
int
TranslationsModel::find( const Translation::Id& id ) const
{
return find( [ & ]( const Translation& l ) { return l.id() == id; } );
} }
TranslationsModel* TranslationsModel*

2
src/libcalamares/locale/TranslationsModel.h
View File

@ -63,6 +63,8 @@ public:
int find( const QLocale& ) const; int find( const QLocale& ) const;
/// @brief Looks for an item that best matches the 2-letter country code /// @brief Looks for an item that best matches the 2-letter country code
int find( const QString& countryCode ) const; int find( const QString& countryCode ) const;
/// @brief Looks up a translation Id
int find( const Translation::Id& id ) const;
private: private:
QVector< Translation* > m_locales; QVector< Translation* > m_locales;