AboutSystem: Only translate hyperlink text. Fixes #7491.

2014-05-04 16:55:17 +12:00
parent 44c0c4d3d0
commit c545f253e1
1 changed files with 43 additions and 30 deletions
@@ -83,6 +83,20 @@ static const rgb_color kLinkBlue = { 80, 80, 200, 255 };
 static const rgb_color kBeOSBlue = { 0, 0, 200, 255 };
 static const rgb_color kBeOSRed = { 200, 0, 0, 255 };

+static const char* kBSDTwoClause = B_TRANSLATE_MARK("BSD (2-clause)");
+static const char* kBSDThreeClause = B_TRANSLATE_MARK("BSD (3-clause)");
+static const char* kBSDFourClause = B_TRANSLATE_MARK("BSD (4-clause)");
+static const char* kGPLv2 = B_TRANSLATE_MARK("GNU GPL v2");
+static const char* kGPLv3 = B_TRANSLATE_MARK("GNU GPL v3");
+static const char* kLGPLv2 = B_TRANSLATE_MARK("GNU LGPL v2");
+static const char* kLGPLv21 = B_TRANSLATE_MARK("GNU LGPL v2.1");
+static const char* kIntel2xxxFirmware = B_TRANSLATE_MARK("Intel (2xxx firmware)");
+static const char* kIntelFirmware = B_TRANSLATE_MARK("Intel (firmware)");
+static const char* kMarvellFirmware = B_TRANSLATE_MARK("Marvell (firmware)");
+static const char* kMITNoPromotion = B_TRANSLATE_MARK("MIT (no promotion)");
+static const char* kPublicDomain = B_TRANSLATE_MARK("Public Domain");
+static const char* kRalinkFirmware = B_TRANSLATE_MARK("Ralink (firmware)");
+
 typedef struct
 {
 	const char* languageCode;
@@ -865,7 +879,7 @@ AboutView::AddCopyrightEntry(const char* name, const char* text,

 			BPath licensePath;
 			if (_GetLicensePath(licenseURL, licensePath) == B_OK) {
-				fCreditsView->InsertHyperText(licenseName,
+				fCreditsView->InsertHyperText(B_TRANSLATE_NOCOLLECT(licenseName),
 					new OpenFileAction(licensePath.Path()));
 			} else
 				fCreditsView->Insert(licenseName);
@@ -1371,7 +1385,7 @@ AboutView::_CreateCreditsView()
 		"gdb, wget, ncurses, termcap, "
 		"Bourne Again Shell.\n"
 		COPYRIGHT_STRING "The Free Software Foundation."),
-		StringVector("GNU LGPL v2.1", "GNU GPL v2", "GNU GPL v3", NULL),
+		StringVector(kLGPLv21, kGPLv2, kGPLv3, NULL),
 		StringVector(),
 		"http://www.gnu.org");

@@ -1383,7 +1397,7 @@ AboutView::_CreateCreditsView()
 		"telnetd, traceroute\n"
 		COPYRIGHT_STRING "1994-2008 The FreeBSD Project. "
 		"All rights reserved."),
-		StringVector("BSD (2-clause)", "BSD (3-clause)", "BSD (4-clause)",
+		StringVector(kBSDTwoClause, kBSDThreeClause, kBSDFourClause,
 			NULL),
 		StringVector(),
 		"http://www.freebsd.org");
@@ -1402,15 +1416,14 @@ AboutView::_CreateCreditsView()
 	_AddPackageCredit(PackageCredit("FFMpeg libavcodec")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2000-2007 Fabrice "
 			"Bellard, et al."))
-		.SetLicenses("GNU LGPL v2.1", "GNU LGPL v2", NULL)
+		.SetLicenses(kLGPLv21, kLGPLv2, NULL)
 		.SetURL("http://www.ffmpeg.org"));

 	// AGG copyrights
 	_AddPackageCredit(PackageCredit("AntiGrain Geometry")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2006 Maxim "
 			"Shemanarev (McSeem)."))
-		.SetLicenses("Anti-Grain Geometry", B_TRANSLATE("BSD (3-clause)"),
-			"GPC", NULL)
+		.SetLicenses("Anti-Grain Geometry", kBSDThreeClause, "GPC", NULL)
 		.SetURL("http://www.antigrain.com"));

 	// PDFLib copyrights
@@ -1474,7 +1487,7 @@ AboutView::_CreateCreditsView()
 			COPYRIGHT_STRING "2006-2012 Project Vine.",
 			B_TRANSLATE("MIT license. All rights reserved."),
 			NULL)
-		.SetLicense("BSD (3-clause)")
+		.SetLicense(kBSDThreeClause)
 		.SetURL("http://vlgothic.dicey.org/"));

 	// expat copyrights
@@ -1504,21 +1517,21 @@ AboutView::_CreateCreditsView()
 	_AddPackageCredit(PackageCredit("bzip2")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1996-2005 Julian R "
 			"Seward. All rights reserved."))
-		.SetLicense(B_TRANSLATE("BSD (4-clause)"))
+		.SetLicense(kBSDFourClause)
 		.SetURL("http://bzip.org"));

 	// lp_solve copyrights
 	_AddPackageCredit(PackageCredit("lp_solve")
 		.SetCopyright(COPYRIGHT_STRING
 			"Michel Berkelaar, Kjell Eikland, Peter Notebaert")
-		.SetLicense("GNU LGPL v2.1")
+		.SetLicense(kLGPLv21)
 		.SetURL("http://lpsolve.sourceforge.net/"));

 	// OpenEXR copyrights
 	_AddPackageCredit(PackageCredit("OpenEXR")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2005 Industrial "
 			"Light & Magic, a division of Lucas Digital Ltd. LLC."))
-		.SetLicense(B_TRANSLATE("BSD (3-clause)"))
+		.SetLicense(kBSDThreeClause)
 		.SetURL("http://www.openexr.com"));

 	// Bullet copyrights
@@ -1531,13 +1544,13 @@ AboutView::_CreateCreditsView()
 	_AddPackageCredit(PackageCredit("atftp")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2000 Jean-Pierre "
 			"ervbefeL and Remi Lefebvre."))
-		.SetLicense("GNU GPL v2")
+		.SetLicense(kGPLv2)
 		.SetURL("http://freecode.com/projects/atftp"));

 	// Netcat copyrights
 	_AddPackageCredit(PackageCredit("Netcat")
 		.SetCopyright(COPYRIGHT_STRING "1996 Hobbit.")
-		.SetLicense("Public Domain")
+		.SetLicense(kPublicDomain)
 		.SetURL("http://nc110.sourceforge.net/"));

 	// acpica copyrights
@@ -1577,14 +1590,14 @@ AboutView::_CreateCreditsView()
 	// cortex copyrights
 	_AddPackageCredit(PackageCredit("Cortex")
 		.SetCopyright(COPYRIGHT_STRING "1999-2000 Eric Moon.")
-		.SetLicense(B_TRANSLATE("BSD (3-clause)"))
+		.SetLicense(kBSDThreeClause)
 		.SetURL("http://cortex.sourceforge.net/documentation"));

 	// FluidSynth copyrights
 	_AddPackageCredit(PackageCredit("FluidSynth")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2003 Peter Hanappe "
 			"and others."))
-		.SetLicense("GNU LGPL v2")
+		.SetLicense(kLGPLv2)
 		.SetURL("http://www.fluidsynth.org"));

 	// CannaIM copyrights
@@ -1596,13 +1609,13 @@ AboutView::_CreateCreditsView()
 	_AddPackageCredit(PackageCredit("libxml2, libxslt")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1998-2003 Daniel Veillard. "
 			"All rights reserved."))
-		.SetLicense(B_TRANSLATE("MIT (no promotion)"))
+		.SetLicense(kMITNoPromotion)
 		.SetURL("http://xmlsoft.org"));

 	_AddPackageCredit(PackageCredit("libexslt")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2001-2002 Thomas Broyer, "
 			"Charlie Bozeman and Daniel Veillard. All rights reserved."))
-		.SetLicense(B_TRANSLATE("MIT (no promotion)"))
+		.SetLicense(kMITNoPromotion)
 		.SetURL("http://xmlsoft.org"));

 	// Xiph.org Foundation copyrights
@@ -1610,20 +1623,20 @@ AboutView::_CreateCreditsView()
 		.SetCopyrights("libvorbis, libogg, libtheora, libspeex",
 			B_TRANSLATE(COPYRIGHT_STRING "1994-2008 Xiph.Org. "
 			"All rights reserved."), NULL)
-		.SetLicense(B_TRANSLATE("BSD (3-clause)"))
+		.SetLicense(kBSDThreeClause)
 		.SetURL("http://www.xiph.org"));

 	// The Tcpdump Group
 	_AddPackageCredit(PackageCredit("The Tcpdump Group")
 		.SetCopyright("tcpdump, libpcap")
-		.SetLicense(B_TRANSLATE("BSD (3-clause)"))
+		.SetLicense(kBSDThreeClause)
 		.SetURL("http://www.tcpdump.org"));

 	// Matroska
 	_AddPackageCredit(PackageCredit("libmatroska")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2003 Steve Lhomme. "
 			"All rights reserved."))
-		.SetLicense("GNU LGPL v2.1")
+		.SetLicense(kLGPLv21)
 		.SetURL("http://www.matroska.org"));

 	// BColorQuantizer (originally CQuantizer code)
@@ -1659,7 +1672,7 @@ AboutView::_CreateCreditsView()
 	_AddPackageCredit(PackageCredit("Udis86")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2004 "
 			"Vivek Mohan. All rights reserved."))
-		.SetLicense(B_TRANSLATE("BSD (2-clause)"))
+		.SetLicense(kBSDTwoClause)
 		.SetURL("http://udis86.sourceforge.net"));
 #endif

@@ -1668,7 +1681,7 @@ AboutView::_CreateCreditsView()
 	_AddPackageCredit(PackageCredit("Intel PRO/Wireless 2100 Firmware")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2003-2006 "
 			"Intel Corporation. All rights reserved."))
-		.SetLicense("Intel (2xxx firmware)")
+		.SetLicense(kIntel2xxxFirmware)
 		.SetURL("http://ipw2100.sourceforge.net/"));
 #endif

@@ -1677,7 +1690,7 @@ AboutView::_CreateCreditsView()
 	_AddPackageCredit(PackageCredit("Intel PRO/Wireless 2200BG Firmware")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2004-2005 "
 			"Intel Corporation. All rights reserved."))
-		.SetLicense("Intel (2xxx firmware)")
+		.SetLicense(kIntel2xxxFirmware)
 		.SetURL("http://ipw2200.sourceforge.net/"));
 #endif

@@ -1688,7 +1701,7 @@ AboutView::_CreateCreditsView()
 			"Intel PRO/Wireless 3945ABG/BG Network Connection Adapter Firmware")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2006-2007 "
 			"Intel Corporation. All rights reserved."))
-		.SetLicense("Intel (firmware)")
+		.SetLicense(kIntelFirmware)
 		.SetURL("http://www.intellinuxwireless.org/"));
 #endif
 #ifdef __INTEL__
@@ -1697,7 +1710,7 @@ AboutView::_CreateCreditsView()
 		PackageCredit("Intel Wireless WiFi Link 4965AGN Adapter Firmware")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2006-2007 "
 			"Intel Corporation. All rights reserved."))
-		.SetLicense("Intel (firmware)")
+		.SetLicense(kIntelFirmware)
 		.SetURL("http://www.intellinuxwireless.org/"));
 #endif

@@ -1706,7 +1719,7 @@ AboutView::_CreateCreditsView()
 	_AddPackageCredit(PackageCredit("Marvell 88w8363")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2007-2009 "
 			"Marvell Semiconductor, Inc. All rights reserved."))
-		.SetLicense("Marvell (firmware)")
+		.SetLicense(kMarvellFirmware)
 		.SetURL("http://www.marvell.com/"));
 #endif

@@ -1715,7 +1728,7 @@ AboutView::_CreateCreditsView()
 	_AddPackageCredit(PackageCredit("Ralink Firmware RT2501/RT2561/RT2661")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2007 "
 			"Ralink Technology Corporation. All rights reserved."))
-		.SetLicense("Ralink (firmware)")
+		.SetLicense(kRalinkFirmware)
 		.SetURL("http://www.ralinktech.com/"));
 #endif

@@ -1723,27 +1736,27 @@ AboutView::_CreateCreditsView()
 	_AddPackageCredit(PackageCredit("Gutenprint")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING
 			"1999-2010 by the authors of Gutenprint. All rights reserved."))
-		.SetLicense("GNU GPL v2")
+		.SetLicense(kGPLv2)
 		.SetURL("http://gutenprint.sourceforge.net/"));

 	// libwebp
 	_AddPackageCredit(PackageCredit("libwebp")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING
 			"2010-2011 Google Inc. All rights reserved."))
-		.SetLicense(B_TRANSLATE("BSD (3-clause)"))
+		.SetLicense(kBSDThreeClause)
 		.SetURL("http://www.webmproject.org/code/#libwebp_webp_image_library"));

 	// GTF
 	_AddPackageCredit(PackageCredit("GTF")
 		.SetCopyright(B_TRANSLATE("2001 by Andy Ritger based on the "
 			"Generalized Timing Formula"))
-		.SetLicense(B_TRANSLATE("BSD (3-clause)"))
+		.SetLicense(kBSDThreeClause)
 		.SetURL("http://gtf.sourceforge.net/"));

 	// libqrencode
 	_AddPackageCredit(PackageCredit("libqrencode")
 		.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2006-2012 Kentaro Fukuchi"))
-		.SetLicense(B_TRANSLATE("GNU LGPL v2.1"))
+		.SetLicense(kLGPLv21)
 		.SetURL("http://fukuchi.org/works/qrencode/"));

 	_AddCopyrightsFromAttribute();