Ticket #7491: 0001-AboutSystem-Only-translate-hyperlink-text.-Fixes-749.patch

File 0001-AboutSystem-Only-translate-hyperlink-text.-Fixes-749.patch, 15.2 KB (added by jessicah, 10 years ago)

  • src/apps/aboutsystem/AboutSystem.cpp 

    From e2941d5bb20b662bc20660802cbb35435e23670e Mon Sep 17 00:00:00 2001
From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
Date: Sat, 19 Apr 2014 23:54:01 +1200
Subject: [PATCH] AboutSystem: Only translate hyperlink text. Fixes #7491.

---
 src/apps/aboutsystem/AboutSystem.cpp | 97 +++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 47 deletions(-)

diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp
index 5cf1558..e99ba30 100644
    a b AboutView::AddCopyrightEntry(const char* name, const char* text,  
    863863
    864864            BPath licensePath;
    865865            if (_GetLicensePath(licenseURL, licensePath) == B_OK) {
    866                 fCreditsView->InsertHyperText(licenseName,
     866                fCreditsView->InsertHyperText(B_TRANSLATE_NOCOLLECT(licenseName),
    867867                    new OpenFileAction(licensePath.Path()));
    868868            } else
    869869                fCreditsView->Insert(licenseName);
    … … AboutView::_CreateCreditsView()  
    14001400    _AddPackageCredit(PackageCredit("FFMpeg libavcodec")
    14011401        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2000-2007 Fabrice "
    14021402            "Bellard, et al."))
    1403         .SetLicenses("GNU LGPL v2.1", "GNU LGPL v2", NULL)
     1403        .SetLicenses(B_TRANSLATE_MARK("GNU LGPL v2.1"),
     1404            B_TRANSLATE_MARK("GNU LGPL v2"), NULL)
    14041405        .SetURL("http://www.ffmpeg.org"));
    14051406
    14061407    // AGG copyrights
    14071408    _AddPackageCredit(PackageCredit("AntiGrain Geometry")
    14081409        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2006 Maxim "
    14091410            "Shemanarev (McSeem)."))
    1410         .SetLicenses("Anti-Grain Geometry", B_TRANSLATE("BSD (3-clause)"),
    1411             "GPC", NULL)
     1411        .SetLicenses(B_TRANSLATE_MARK("Anti-Grain Geometry"),
     1412            B_TRANSLATE_MARK("BSD (3-clause)"),
     1413            B_TRANSLATE_MARK("GPC"), NULL)
    14121414        .SetURL("http://www.antigrain.com"));
    14131415
    14141416    // PDFLib copyrights
    … … AboutView::_CreateCreditsView()  
    14161418        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1997-2006 PDFlib GmbH and "
    14171419            "Thomas Merz. All rights reserved.\n"
    14181420            "PDFlib and PDFlib logo are registered trademarks of PDFlib GmbH."))
    1419         .SetLicense("PDFlib Lite")
     1421        .SetLicense(B_TRANSLATE_MARK("PDFlib Lite"))
    14201422        .SetURL("http://www.pdflib.com"));
    14211423
    14221424    // FreeType copyrights
    … … AboutView::_CreateCreditsView()  
    14251427            "copyright.\n"
    14261428            COPYRIGHT_STRING "1996-2006 "
    14271429            "The FreeType Project. All rights reserved."))
    1428         .SetLicense("FTL")
     1430        .SetLicense(B_TRANSLATE_MARK("FTL"))
    14291431        .SetURL("http://www.freetype.org"));
    14301432
    14311433    // Mesa3D (http://www.mesa3d.org) copyrights
    14321434    _AddPackageCredit(PackageCredit("Mesa")
    14331435        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1999-2006 Brian Paul. "
    14341436            "Mesa3D Project. All rights reserved."))
    1435         .SetLicense("MIT")
     1437        .SetLicense(B_TRANSLATE_MARK("MIT"))
    14361438        .SetURL("http://www.mesa3d.org"));
    14371439
    14381440    // SGI's GLU implementation copyrights
    14391441    _AddPackageCredit(PackageCredit("GLU")
    14401442        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1991-2000 "
    14411443            "Silicon Graphics, Inc. All rights reserved."))
    1442         .SetLicense("SGI Free B")
     1444        .SetLicense(B_TRANSLATE_MARK("SGI Free B"))
    14431445        .SetURL("http://www.sgi.com/products/software/opengl"));
    14441446
    14451447    // GLUT implementation copyrights
    … … AboutView::_CreateCreditsView()  
    14491451            COPYRIGHT_STRING "1997 Be Inc.",
    14501452            COPYRIGHT_STRING "1999 Jake Hamby.",
    14511453            NULL)
    1452         .SetLicense("GLUT (Mark Kilgard)")
     1454        .SetLicense(B_TRANSLATE_MARK("GLUT (Mark Kilgard)"))
    14531455        .SetURL("http://www.opengl.org/resources/libraries/glut"));
    14541456
    14551457    // OpenGroup & DEC (BRegion backend) copyright
    … … AboutView::_CreateCreditsView()  
    14591461            "Corporation, Maynard, Massachusetts.\n"
    14601462            "All rights reserved."),
    14611463            NULL)
    1462         .SetLicenses("OpenGroup", "DEC", NULL));
     1464        .SetLicenses(B_TRANSLATE_MARK("OpenGroup"),
     1465            B_TRANSLATE_MARK("DEC"), NULL));
    14631466            // TODO: URL
    14641467
    14651468    // VL-Gothic font
    … … AboutView::_CreateCreditsView()  
    14721475            COPYRIGHT_STRING "2006-2012 Project Vine.",
    14731476            B_TRANSLATE("MIT license. All rights reserved."),
    14741477            NULL)
    1475         .SetLicense("BSD (3-clause)")
     1478        .SetLicense(B_TRANSLATE_MARK("BSD (3-clause)"))
    14761479        .SetURL("http://vlgothic.dicey.org/"));
    14771480
    14781481    // expat copyrights
    … … AboutView::_CreateCreditsView()  
    14811484            "Open Source Software Center Ltd and Clark Cooper."),
    14821485            B_TRANSLATE(COPYRIGHT_STRING "2001-2003 Expat maintainers."),
    14831486            NULL)
    1484         .SetLicense("Expat")
     1487        .SetLicense(B_TRANSLATE_MARK("Expat"))
    14851488        .SetURL("http://expat.sourceforge.net"));
    14861489
    14871490    // zlib copyrights
    14881491    _AddPackageCredit(PackageCredit("zlib")
    14891492        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1995-2004 Jean-loup "
    14901493            "Gailly and Mark Adler."))
    1491         .SetLicense("Zlib")
     1494        .SetLicense(B_TRANSLATE_MARK("Zlib"))
    14921495        .SetURL("http://www.zlib.net"));
    14931496
    14941497    // zip copyrights
    14951498    _AddPackageCredit(PackageCredit("Info-ZIP")
    14961499        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1990-2002 Info-ZIP. "
    14971500            "All rights reserved."))
    1498         .SetLicense("Info-ZIP")
     1501        .SetLicense(B_TRANSLATE_MARK("Info-ZIP"))
    14991502        .SetURL("http://www.info-zip.org"));
    15001503
    15011504    // bzip2 copyrights
    15021505    _AddPackageCredit(PackageCredit("bzip2")
    15031506        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1996-2005 Julian R "
    15041507            "Seward. All rights reserved."))
    1505         .SetLicense(B_TRANSLATE("BSD (4-clause)"))
     1508        .SetLicense(B_TRANSLATE_MARK("BSD (4-clause)"))
    15061509        .SetURL("http://bzip.org"));
    15071510
    15081511    // lp_solve copyrights
    15091512    _AddPackageCredit(PackageCredit("lp_solve")
    15101513        .SetCopyright(COPYRIGHT_STRING
    15111514            "Michel Berkelaar, Kjell Eikland, Peter Notebaert")
    1512         .SetLicense("GNU LGPL v2.1")
     1515        .SetLicense(B_TRANSLATE_MARK("GNU LGPL v2.1"))
    15131516        .SetURL("http://lpsolve.sourceforge.net/"));
    15141517
    15151518    // OpenEXR copyrights
    15161519    _AddPackageCredit(PackageCredit("OpenEXR")
    15171520        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2005 Industrial "
    15181521            "Light & Magic, a division of Lucas Digital Ltd. LLC."))
    1519         .SetLicense(B_TRANSLATE("BSD (3-clause)"))
     1522        .SetLicense(B_TRANSLATE_MARK("BSD (3-clause)"))
    15201523        .SetURL("http://www.openexr.com"));
    15211524
    15221525    // Bullet copyrights
    15231526    _AddPackageCredit(PackageCredit("Bullet")
    15241527        .SetCopyright(COPYRIGHT_STRING "2003-2008 Erwin Coumans")
    1525         .SetLicense("Bullet")
     1528        .SetLicense(B_TRANSLATE_MARK("Bullet"))
    15261529        .SetURL("http://www.bulletphysics.com"));
    15271530
    15281531    // atftp copyrights
    15291532    _AddPackageCredit(PackageCredit("atftp")
    15301533        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2000 Jean-Pierre "
    15311534            "ervbefeL and Remi Lefebvre."))
    1532         .SetLicense("GNU GPL v2")
     1535        .SetLicense(B_TRANSLATE_MARK("GNU GPL v2"))
    15331536        .SetURL("http://freecode.com/projects/atftp"));
    15341537
    15351538    // Netcat copyrights
    15361539    _AddPackageCredit(PackageCredit("Netcat")
    15371540        .SetCopyright(COPYRIGHT_STRING "1996 Hobbit.")
    1538         .SetLicense("Public Domain")
     1541        .SetLicense(B_TRANSLATE_MARK("Public Domain"))
    15391542        .SetURL("http://nc110.sourceforge.net/"));
    15401543
    15411544    // acpica copyrights
    15421545    _AddPackageCredit(PackageCredit("acpica")
    15431546        .SetCopyright(COPYRIGHT_STRING "1999-2006 Intel Corp.")
    1544         .SetLicense("Intel (ACPICA)")
     1547        .SetLicense(B_TRANSLATE_MARK("Intel (ACPICA)"))
    15451548        .SetURL("http://www.acpica.org"));
    15461549
    15471550    // unrar copyrights
    15481551    _AddPackageCredit(PackageCredit("unrar")
    15491552        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2008 Alexander "
    15501553            "L. Roshal. All rights reserved."))
    1551         .SetLicense("UnRAR")
     1554        .SetLicense(B_TRANSLATE_MARK("UnRAR"))
    15521555        .SetURL("http://www.rarlab.com"));
    15531556
    15541557    // libpng copyrights
    15551558    _AddPackageCredit(PackageCredit("libpng")
    15561559        .SetCopyright(COPYRIGHT_STRING "2004, 2006-2008 Glenn "
    15571560            "Randers-Pehrson.")
    1558         .SetLicense("LibPNG")
     1561        .SetLicense(B_TRANSLATE_MARK("LibPNG"))
    15591562        .SetURL("http://www.libpng.org"));
    15601563
    15611564    // libjpeg copyrights
    … … AboutView::_CreateCreditsView()  
    15631566        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1994-2009, Thomas G. "
    15641567            "Lane, Guido Vollbeding. This software is based in part on the "
    15651568            "work of the Independent JPEG Group."))
    1566         .SetLicense("LibJPEG")
     1569        .SetLicense(B_TRANSLATE_MARK("LibJPEG"))
    15671570        .SetURL("http://www.ijg.org"));
    15681571
    15691572    // libprint copyrights
    … … AboutView::_CreateCreditsView()  
    15751578    // cortex copyrights
    15761579    _AddPackageCredit(PackageCredit("Cortex")
    15771580        .SetCopyright(COPYRIGHT_STRING "1999-2000 Eric Moon.")
    1578         .SetLicense(B_TRANSLATE("BSD (3-clause)"))
     1581        .SetLicense(B_TRANSLATE_MARK("BSD (3-clause)"))
    15791582        .SetURL("http://cortex.sourceforge.net/documentation"));
    15801583
    15811584    // FluidSynth copyrights
    15821585    _AddPackageCredit(PackageCredit("FluidSynth")
    15831586        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2003 Peter Hanappe "
    15841587            "and others."))
    1585         .SetLicense("GNU LGPL v2")
     1588        .SetLicense(B_TRANSLATE_MARK("GNU LGPL v2"))
    15861589        .SetURL("http://www.fluidsynth.org"));
    15871590
    15881591    // CannaIM copyrights
    15891592    _AddPackageCredit(PackageCredit("CannaIM")
    15901593        .SetCopyright(COPYRIGHT_STRING "1999 Masao Kawamura.")
    1591         .SetLicense("MIT"));
     1594        .SetLicense(B_TRANSLATE_MARK("MIT")));
    15921595
    15931596    // libxml2, libxslt, libexslt copyrights
    15941597    _AddPackageCredit(PackageCredit("libxml2, libxslt")
    15951598        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1998-2003 Daniel Veillard. "
    15961599            "All rights reserved."))
    1597         .SetLicense(B_TRANSLATE("MIT (no promotion)"))
     1600        .SetLicense(B_TRANSLATE_MARK("MIT (no promotion)"))
    15981601        .SetURL("http://xmlsoft.org"));
    15991602
    16001603    _AddPackageCredit(PackageCredit("libexslt")
    16011604        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2001-2002 Thomas Broyer, "
    16021605            "Charlie Bozeman and Daniel Veillard. All rights reserved."))
    1603         .SetLicense(B_TRANSLATE("MIT (no promotion)"))
     1606        .SetLicense(B_TRANSLATE_MARK("MIT (no promotion)"))
    16041607        .SetURL("http://xmlsoft.org"));
    16051608
    16061609    // Xiph.org Foundation copyrights
    … … AboutView::_CreateCreditsView()  
    16081611        .SetCopyrights("libvorbis, libogg, libtheora, libspeex",
    16091612            B_TRANSLATE(COPYRIGHT_STRING "1994-2008 Xiph.Org. "
    16101613            "All rights reserved."), NULL)
    1611         .SetLicense(B_TRANSLATE("BSD (3-clause)"))
     1614        .SetLicense(B_TRANSLATE_MARK("BSD (3-clause)"))
    16121615        .SetURL("http://www.xiph.org"));
    16131616
    16141617    // The Tcpdump Group
    16151618    _AddPackageCredit(PackageCredit("The Tcpdump Group")
    16161619        .SetCopyright("tcpdump, libpcap")
    1617         .SetLicense(B_TRANSLATE("BSD (3-clause)"))
     1620        .SetLicense(B_TRANSLATE_MARK("BSD (3-clause)"))
    16181621        .SetURL("http://www.tcpdump.org"));
    16191622
    16201623    // Matroska
    16211624    _AddPackageCredit(PackageCredit("libmatroska")
    16221625        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2003 Steve Lhomme. "
    16231626            "All rights reserved."))
    1624         .SetLicense("GNU LGPL v2.1")
     1627        .SetLicense(B_TRANSLATE_MARK("GNU LGPL v2.1"))
    16251628        .SetURL("http://www.matroska.org"));
    16261629
    16271630    // BColorQuantizer (originally CQuantizer code)
    16281631    _AddPackageCredit(PackageCredit("CQuantizer")
    16291632        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1996-1997 Jeff Prosise. "
    16301633            "All rights reserved."))
    1631         .SetLicense("CQuantizer")
     1634        .SetLicense(B_TRANSLATE_MARK("CQuantizer"))
    16321635        .SetURL("http://www.xdp.it"));
    16331636
    16341637    // MAPM (Mike's Arbitrary Precision Math Library) used by DeskCalc
    16351638    _AddPackageCredit(PackageCredit("MAPM")
    16361639        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1999-2007 Michael C. "
    16371640            "Ring. All rights reserved."))
    1638         .SetLicense("MAPM")
     1641        .SetLicense(B_TRANSLATE_MARK("MAPM"))
    16391642        .SetURL("http://tc.umn.edu/~ringx004"));
    16401643
    16411644    // MkDepend 1.7 copyright (Makefile dependency generator)
    16421645    _AddPackageCredit(PackageCredit("MkDepend")
    16431646        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1995-2001 Lars Düning. "
    16441647            "All rights reserved."))
    1645         .SetLicense("MkDepend")
     1648        .SetLicense(B_TRANSLATE_MARK("MkDepend"))
    16461649        .SetURL("http://bearnip.com/lars/be"));
    16471650
    16481651    // libhttpd copyright (used as Poorman backend)
    16491652    _AddPackageCredit(PackageCredit("libhttpd")
    16501653        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1995, 1998-2001 "
    16511654            "Jef Poskanzer. All rights reserved."))
    1652         .SetLicense("LibHTTPd")
     1655        .SetLicense(B_TRANSLATE_MARK("LibHTTPd"))
    16531656        .SetURL("http://www.acme.com/software/thttpd/"));
    16541657
    16551658#ifdef __INTEL__
    … … AboutView::_CreateCreditsView()  
    16571660    _AddPackageCredit(PackageCredit("Udis86")
    16581661        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2002-2004 "
    16591662            "Vivek Mohan. All rights reserved."))
    1660         .SetLicense(B_TRANSLATE("BSD (2-clause)"))
     1663        .SetLicense(B_TRANSLATE_MARK("BSD (2-clause)"))
    16611664        .SetURL("http://udis86.sourceforge.net"));
    16621665#endif
    16631666
    … … AboutView::_CreateCreditsView()  
    16661669    _AddPackageCredit(PackageCredit("Intel PRO/Wireless 2100 Firmware")
    16671670        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2003-2006 "
    16681671            "Intel Corporation. All rights reserved."))
    1669         .SetLicense("Intel (2xxx firmware)")
     1672        .SetLicense(B_TRANSLATE_MARK("Intel (2xxx firmware)"))
    16701673        .SetURL("http://ipw2100.sourceforge.net/"));
    16711674#endif
    16721675
    … … AboutView::_CreateCreditsView()  
    16751678    _AddPackageCredit(PackageCredit("Intel PRO/Wireless 2200BG Firmware")
    16761679        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2004-2005 "
    16771680            "Intel Corporation. All rights reserved."))
    1678         .SetLicense("Intel (2xxx firmware)")
     1681        .SetLicense(B_TRANSLATE_MARK("Intel (2xxx firmware)"))
    16791682        .SetURL("http://ipw2200.sourceforge.net/"));
    16801683#endif
    16811684
    … … AboutView::_CreateCreditsView()  
    16861689            "Intel PRO/Wireless 3945ABG/BG Network Connection Adapter Firmware")
    16871690        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2006-2007 "
    16881691            "Intel Corporation. All rights reserved."))
    1689         .SetLicense("Intel (firmware)")
     1692        .SetLicense(B_TRANSLATE_MARK("Intel (firmware)"))
    16901693        .SetURL("http://www.intellinuxwireless.org/"));
    16911694#endif
    16921695#ifdef __INTEL__
    … … AboutView::_CreateCreditsView()  
    16951698        PackageCredit("Intel Wireless WiFi Link 4965AGN Adapter Firmware")
    16961699        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2006-2007 "
    16971700            "Intel Corporation. All rights reserved."))
    1698         .SetLicense("Intel (firmware)")
     1701        .SetLicense(B_TRANSLATE_MARK("Intel (firmware)"))
    16991702        .SetURL("http://www.intellinuxwireless.org/"));
    17001703#endif
    17011704
    … … AboutView::_CreateCreditsView()  
    17041707    _AddPackageCredit(PackageCredit("Marvell 88w8363")
    17051708        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2007-2009 "
    17061709            "Marvell Semiconductor, Inc. All rights reserved."))
    1707         .SetLicense("Marvell (firmware)")
     1710        .SetLicense(B_TRANSLATE_MARK("Marvell (firmware)"))
    17081711        .SetURL("http://www.marvell.com/"));
    17091712#endif
    17101713
    … … AboutView::_CreateCreditsView()  
    17131716    _AddPackageCredit(PackageCredit("Ralink Firmware RT2501/RT2561/RT2661")
    17141717        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2007 "
    17151718            "Ralink Technology Corporation. All rights reserved."))
    1716         .SetLicense("Ralink (firmware)")
     1719        .SetLicense(B_TRANSLATE_MARK("Ralink (firmware)"))
    17171720        .SetURL("http://www.ralinktech.com/"));
    17181721#endif
    17191722
    … … AboutView::_CreateCreditsView()  
    17211724    _AddPackageCredit(PackageCredit("Gutenprint")
    17221725        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING
    17231726            "1999-2010 by the authors of Gutenprint. All rights reserved."))
    1724         .SetLicense("GNU GPL v2")
     1727        .SetLicense(B_TRANSLATE_MARK("GNU GPL v2"))
    17251728        .SetURL("http://gutenprint.sourceforge.net/"));
    17261729
    17271730    // libwebp
    17281731    _AddPackageCredit(PackageCredit("libwebp")
    17291732        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING
    17301733            "2010-2011 Google Inc. All rights reserved."))
    1731         .SetLicense(B_TRANSLATE("BSD (3-clause)"))
     1734        .SetLicense(B_TRANSLATE_MARK("BSD (3-clause)"))
    17321735        .SetURL("http://www.webmproject.org/code/#libwebp_webp_image_library"));
    17331736
    17341737    // GTF
    17351738    _AddPackageCredit(PackageCredit("GTF")
    17361739        .SetCopyright(B_TRANSLATE("2001 by Andy Ritger based on the "
    17371740            "Generalized Timing Formula"))
    1738         .SetLicense(B_TRANSLATE("BSD (3-clause)"))
     1741        .SetLicense(B_TRANSLATE_MARK("BSD (3-clause)"))
    17391742        .SetURL("http://gtf.sourceforge.net/"));
    17401743
    17411744    // libqrencode
    17421745    _AddPackageCredit(PackageCredit("libqrencode")
    17431746        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2006-2012 Kentaro Fukuchi"))
    1744         .SetLicense(B_TRANSLATE("GNU LGPL v2.1"))
     1747        .SetLicense(B_TRANSLATE_MARK("GNU LGPL v2.1"))
    17451748        .SetURL("http://fukuchi.org/works/qrencode/"));
    17461749
    17471750    _AddCopyrightsFromAttribute();