linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3289
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Mon 2013-05-13 20:32:08 +0200
message:
  add strings for the region geo db (not implemented for now)
modified:
  dcpp/SettingsManager.cpp
  dcpp/SettingsManager.h
  help/settings_appearance.html
  win32/AppearancePage.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dcpp/SettingsManager.cpp'
--- dcpp/SettingsManager.cpp	2013-05-05 12:36:15 +0000
+++ dcpp/SettingsManager.cpp	2013-05-13 18:32:08 +0000
@@ -94,7 +94,7 @@
 	"CompressTransfers", "ConfirmADLSRemoval", "ConfirmExit", "ConfirmHubClosing",
 	"ConfirmHubRemoval", "ConfirmItemRemoval", "ConfirmUserRemoval", "Coral", "DcextRegister",
 	"DontDlAlreadyQueued", "DontDLAlreadyShared", "FavShowJoins", "FilterMessages",
-	"FinishedDLOnlyFull", "FollowLinks", "GeoCity", "GetUserCountry", "GetUserInfo",
+	"FinishedDLOnlyFull", "FollowLinks", "GeoCity", "GeoRegion", "GetUserCountry", "GetUserInfo",
 	"HubUserCommands", "IgnoreBotPms", "IgnoreHubPms", "OpenNewWindow", "KeepFinishedFiles",
 	"KeepLists", "ListDuplicates", "LogDownloads", "LogFilelistTransfers", "LogFinishedDownloads",
 	"LogMainChat", "LogPrivateChat", "LogStatusMessages", "LogSystem", "LogUploads", "MagnetAsk",
@@ -240,6 +240,7 @@
 	setDefault(MAX_HASH_SPEED, 0);
 	setDefault(OPEN_USER_CMD_HELP, true);
 	setDefault(GEO_CITY, false);
+	setDefault(GEO_REGION, false);
 	setDefault(GET_USER_COUNTRY, true);
 	setDefault(FAV_SHOW_JOINS, false);
 	setDefault(LOG_STATUS_MESSAGES, false);

=== modified file 'dcpp/SettingsManager.h'
--- dcpp/SettingsManager.h	2013-04-22 22:31:37 +0000
+++ dcpp/SettingsManager.h	2013-05-13 18:32:08 +0000
@@ -131,7 +131,7 @@
 		COMPRESS_TRANSFERS, CONFIRM_ADLS_REMOVAL, CONFIRM_EXIT, CONFIRM_HUB_CLOSING,
 		CONFIRM_HUB_REMOVAL, CONFIRM_ITEM_REMOVAL, CONFIRM_USER_REMOVAL, CORAL, DCEXT_REGISTER,
 		DONT_DL_ALREADY_QUEUED, DONT_DL_ALREADY_SHARED, FAV_SHOW_JOINS, FILTER_MESSAGES,
-		FINISHED_DL_ONLY_FULL, FOLLOW_LINKS, GEO_CITY, GET_USER_COUNTRY, GET_USER_INFO,
+		FINISHED_DL_ONLY_FULL, FOLLOW_LINKS, GEO_CITY, GEO_REGION, GET_USER_COUNTRY, GET_USER_INFO,
 		HUB_USER_COMMANDS, IGNORE_BOT_PMS, IGNORE_HUB_PMS, JOIN_OPEN_NEW_WINDOW, KEEP_FINISHED_FILES,
 		KEEP_LISTS, LIST_DUPES, LOG_DOWNLOADS, LOG_FILELIST_TRANSFERS, LOG_FINISHED_DOWNLOADS,
 		LOG_MAIN_CHAT, LOG_PRIVATE_CHAT, LOG_STATUS_MESSAGES, LOG_SYSTEM, LOG_UPLOADS, MAGNET_ASK,

=== modified file 'help/settings_appearance.html'
--- help/settings_appearance.html	2013-04-18 19:45:45 +0000
+++ help/settings_appearance.html	2013-05-13 18:32:08 +0000
@@ -55,6 +55,13 @@
   <b>%[areacode]</b>, <b>%[city]</b>, <b>%[lat]</b>, <b>%[long]</b>, <b>%[metrocode]</b>,
   <b>%[postcode]</b>, <b>%[region]</b>.
   </dd>
+  <dt>Region name geolocation database (allows %[region])</dt>
+  <dd cshelp="IDH_SETTINGS_APPEARANCE_GEO_REGION">
+  Complement the city-level geolocation database with one containing region names. By default, the
+  <b>%[region]</b> parameter of city-level databases contains cryptic codes that may be difficult
+  to relate to the actual region; enable this setting to download a database that will be used to
+  translate these codes into more understandable region names.
+  </dd>
 </dl>
 <h2>Miscellaneous</h2>
 <dl style="margin-left: 40px;">

=== modified file 'win32/AppearancePage.cpp'
--- win32/AppearancePage.cpp	2013-04-16 16:11:50 +0000
+++ win32/AppearancePage.cpp	2013-05-13 18:32:08 +0000
@@ -46,6 +46,7 @@
 	{ SettingsManager::SORT_FAVUSERS_FIRST, N_("Sort favorite users first"), IDH_SETTINGS_APPEARANCE_SORT_FAVUSERS_FIRST },
 	{ SettingsManager::GET_USER_COUNTRY, N_("Guess user country from IP"), IDH_SETTINGS_APPEARANCE_GET_USER_COUNTRY },
 	{ SettingsManager::GEO_CITY, N_("City-level geolocation database (allows parameters such as %[city])"), IDH_SETTINGS_APPEARANCE_GEO_CITY },
+	{ SettingsManager::GEO_REGION, N_("Region name geolocation database (allows %[region])"), IDH_SETTINGS_APPEARANCE_GEO_REGION },
 	{ 0, 0 }
 };