Update ledokol.lua

Verlihub · Aug 16, 2014 · 14c4f49 · 14c4f49
1 parent 22a019a
commit 14c4f49
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/ledokol.lua b/ledokol.lua
@@ -8057,6 +8057,16 @@ else -- user
 				info = info .. " " .. string.format (gettext ("IP range: %s - %s"), geoip ["range_low"], geoip ["range_high"]) .. "\r\n" -- range
 			end
 
+			if geoip ["country_code"] then
+				local extra = ""
+
+				if geoip ["country"] then
+					extra = "=" .. geoip ["country"]
+				end
+
+				info = info .. " " .. gettext ("Country: %s"):format (geoip ["country_code"] .. extra) .. "\r\n" -- country code and country
+			end
+
 			if geoip ["city"] then
 				info = info .. " " .. string.format (gettext ("City: %s"), geoip ["city"]) .. "\r\n" -- city
 			end
@@ -8071,16 +8081,6 @@ else -- user
 				info = info .. " " .. string.format (gettext ("Region: %s"), geoip ["region_code"] .. extra) .. "\r\n" -- region code and region
 			end
 
-			if geoip ["country_code"] then
-				local extra = ""
-
-				if geoip ["country"] then
-					extra = "=" .. geoip ["country"]
-				end
-
-				info = info .. " " .. string.format (gettext ("Country: %s"), geoip ["country_code"] .. extra) .. "\r\n" -- country code and country
-			end
-
 			if geoip ["continent_code"] then
 				local extra = ""
 
@@ -8204,6 +8204,16 @@ function showipinfo (nick, ip)
 				info = info .. " " .. string.format (gettext ("IP range: %s - %s"), geoip ["range_low"], geoip ["range_high"]) .. "\r\n" -- range
 			end
 
+			if geoip ["country_code"] then
+				local extra = ""
+
+				if geoip ["country"] then
+					extra = "=" .. geoip ["country"]
+				end
+
+				info = info .. " " .. gettext ("Country: %s"):format (geoip ["country_code"] .. extra) .. "\r\n" -- country code and country
+			end
+
 			if geoip ["city"] then
 				info = info .. " " .. string.format (gettext ("City: %s"), geoip ["city"]) .. "\r\n" -- city
 			end
@@ -8218,16 +8228,6 @@ function showipinfo (nick, ip)
 				info = info .. " " .. string.format (gettext ("Region: %s"), geoip ["region_code"] .. extra) .. "\r\n" -- region code and region
 			end
 
-			if geoip ["country_code"] then
-				local extra = ""
-
-				if geoip ["country"] then
-					extra = "=" .. geoip ["country"]
-				end
-
-				info = info .. " " .. string.format (gettext ("Country: %s"), geoip ["country_code"] .. extra) .. "\r\n" -- country code and country
-			end
-
 			if geoip ["continent_code"] then
 				local extra = ""