mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: Change Salty to Brackish

Browse source 
In the code, the difference between SALTYWATER and SALTWATER is hard
to see. More importantly, in the UI - Brackish is the word for water
that has more salt that freshwater but less salt that seawater. The
docs already use the word to clarify what is meant.
This commit is contained in:
Monty Taylor 2020-05-04 18:07:56 -05:00 • committed by Dirk Hohndel
parent 95e6792c4f
commit 7a9214575e
5 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/qthelper.cpp
View file

@ -631,7 +631,7 @@ QString get_water_type_string(int salinity)
if (salinity < 10050)
return waterTypes[FRESHWATER];
else if (salinity < 10190)
return waterTypes[SALTYWATER];
return waterTypes[BRACKISHWATER];
else if (salinity < 10210)
return waterTypes[EN13319WATER];
else
@ -1162,7 +1162,7 @@ QString localFilePath(const QString &originalFilename)
// the water types need to match the watertypes enum
const QStringList waterTypes = {
gettextFromC::tr("Fresh"), gettextFromC::tr("Salty"), gettextFromC::tr("EN13319"), gettextFromC::tr("Salt"), gettextFromC::tr("use dc")
gettextFromC::tr("Fresh"), gettextFromC::tr("Brackish"), gettextFromC::tr("EN13319"), gettextFromC::tr("Salt"), gettextFromC::tr("use dc")
};
// TODO: Apparently Qt has no simple way of listing the supported video