AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android][l18n] fix localization of percentages in text

Browse source 
Signed-off-by: soshial <soshial@gmail.com>
This commit is contained in:
soshial 2025-02-02 11:39:48 +01:00 • committed by Konstantin Pastbin
parent 29cf6abd7d
commit b831eba92d
5 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java
View file

@ -150,12 +150,11 @@ class DownloaderScreen extends BaseScreen
return getCarContext().getString(R.string.downloader_loading_ios);
final long downloadedSize = getDownloadedSize();
final float progress = (float) downloadedSize / mTotalSize * 100;
final String progressPercent = StringUtils.formatPercent((double) downloadedSize / mTotalSize);
final String totalSizeStr = StringUtils.getFileSizeString(getCarContext(), mTotalSize);
final String downloadedSizeStr = StringUtils.getFileSizeString(getCarContext(), downloadedSize);
return StringUtils.formatUsingSystemLocale("%.2f%%\n%s",
progress, downloadedSizeStr + " / " + totalSizeStr);
return progressPercent + "\n" + downloadedSizeStr + " / " + totalSizeStr;
}
private long getDownloadedSize()

4
android/app/src/main/java/app/organicmaps/downloader/CountryItem.java
View file

@ -63,7 +63,9 @@ public final class CountryItem implements Comparable<CountryItem>
public int errorCode;
public boolean present;
// Progress
/**
* This value represents the percentage of download (values span from 0 to 100)
*/
public float progress;
public long downloadedBytes;
public long bytesToDownload;

3
android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
View file

@ -192,8 +192,7 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
private void updateProgress()
{
String text = StringUtils.formatUsingSystemLocale("%1$s %2$.2f%%", getString(R.string.downloader_downloading),
mDownloadingCountry.progress);
String text = getString(R.string.downloader_downloading) + " " + StringUtils.formatPercent(mDownloadingCountry.progress / 100);
mTvProgress.setText(text);
mWpvDownloadProgress.setProgress(Math.round(mDownloadingCountry.progress));
}

3
android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
View file

@ -140,8 +140,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
{
mProgress.setPending(false);
mProgress.setProgress(Math.round(mCurrentCountry.progress));
sizeText = StringUtils.formatUsingSystemLocale("%1$s %2$.2f%%",
mActivity.getString(R.string.downloader_downloading), mCurrentCountry.progress);
sizeText = mActivity.getString(R.string.downloader_downloading) + " " + StringUtils.formatPercent(mCurrentCountry.progress / 100);
}
else
{

20
android/app/src/main/java/app/organicmaps/util/StringUtils.java
View file

@ -10,6 +10,7 @@ import androidx.annotation.NonNull;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import java.text.NumberFormat;
import java.util.Locale;
public class StringUtils
@ -24,6 +25,25 @@ public class StringUtils
return String.format(Locale.getDefault(), pattern, args);
}
/**
* This method returns correct string representation of % (percent number) for different locales
* For example, that's how the result of would look like:
* — formatPercent(0.2319) will return 23.19% (in US locale)
* — formatPercent(0.2319) will return %23.19 (in Turkish locale)
* — formatPercent(0.2319) will return 23,19% (in Latvian locale)
* — formatPercent(1.23) will return 123%
* — formatPercent(0.000145) will return 0.01%
* — formatPercent(0.37) will return 37%
*
* @param fraction a double value, that represents a fraction of a whole
* @return correct string representation of percent for different locales
*/
public static String formatPercent(double fraction) {
NumberFormat percentFormat = NumberFormat.getPercentInstance();
percentFormat.setMaximumFractionDigits(2);
return percentFormat.format(fraction);
}
public static native boolean nativeIsHtml(String text);
public static native boolean nativeContainsNormalized(String str, String substr);