From 3aecbf371b83eff80c57dc461513039d30b49466 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Wed, 20 Mar 2019 13:28:42 +0000
Subject: [PATCH] [net] fix display of download filesize for RTL languages

* Closes #1279
---
 src/net.c    |  5 ++++-
 src/rufus.rc | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/net.c b/src/net.c
index 48228d09..beda9ee5 100644
--- a/src/net.c
+++ b/src/net.c
@@ -415,7 +415,10 @@ uint64_t DownloadToFileOrBuffer(const char* url, const char* file, BYTE** buffer
 	if (hProgressDialog != NULL) {
 		char msg[128];
 		uprintf("File length: %s", SizeToHumanReadable(total_size, FALSE, FALSE));
-		static_sprintf(msg, "%s (%s)", GetShortName(url), SizeToHumanReadable(total_size, FALSE, FALSE));
+		if (right_to_left_mode)
+			static_sprintf(msg, "(%s) %s", SizeToHumanReadable(total_size, FALSE, FALSE), GetShortName(url));
+		else
+			static_sprintf(msg, "%s (%s)", GetShortName(url), SizeToHumanReadable(total_size, FALSE, FALSE));
 		PrintStatus(0, MSG_085, msg);
 	}
 
diff --git a/src/rufus.rc b/src/rufus.rc
index b8d42e17..d3068135 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.5.1480"
+CAPTION "Rufus 3.5.1481"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -394,8 +394,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,1480,0
- PRODUCTVERSION 3,5,1480,0
+ FILEVERSION 3,5,1481,0
+ PRODUCTVERSION 3,5,1481,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -413,13 +413,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.5.1480"
+            VALUE "FileVersion", "3.5.1481"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.5.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.5.1480"
+            VALUE "ProductVersion", "3.5.1481"
         END
     END
     BLOCK "VarFileInfo"