summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Pfeiler <norbert.pfeiler+git@gmail.com>2022-01-29 08:09:46 +0100
committerBastien Nocera <hadess@hadess.net>2022-03-23 09:36:24 +0000
commit02bbab7b8abf7512c49e8be82c61c0c604677448 (patch)
tree7a31890ad1068513ba02369fbefd6826db922f07
parent54b215e1e9e6d1fbab67c82f47209f3f3206d62f (diff)
downloadgnome-control-center-02bbab7b8abf7512c49e8be82c61c0c604677448.tar.gz
info-overview: Replace the trademark symbols in a more generic way
-rw-r--r--panels/info-overview/info-cleanup.c5
-rw-r--r--tests/info/info-cleanup-test.txt2
2 files changed, 4 insertions, 3 deletions
diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c
index 10418a5ec..25d957a1d 100644
--- a/panels/info-overview/info-cleanup.c
+++ b/panels/info-overview/info-cleanup.c
@@ -37,9 +37,8 @@ prettify_info (const char *info)
int i;
static const ReplaceStrings rs[] = {
{ "Mesa DRI ", ""},
- { "Intel[(]R[)]", "Intel\302\256"},
- { "Core[(]TM[)]", "Core\342\204\242"},
- { "Atom[(]TM[)]", "Atom\342\204\242"},
+ { "[(]R[)]", "\302\256"},
+ { "[(](tm|TM)[)]", "\342\204\242"},
{ "Gallium \\d+\\.\\d+ on (.*)", "\\1"},
{ " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""},
{ "Graphics Controller", "Graphics"},
diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt
index 2f4327977..e8ca5da0f 100644
--- a/tests/info/info-cleanup-test.txt
+++ b/tests/info/info-cleanup-test.txt
@@ -11,3 +11,5 @@ AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 1
AMD EPYC 7251 8-Core Processor AMD EPYC 7251 8-Core Processor
Gallium 0.4 on SVGA3D SVGA3D
Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe
+AMD FX(tm)-8350 Eight-Core Processor AMD FX™-8350 Eight-Core Processor
+AMD Athlon(tm) II X3 435 Processor AMD Athlon™ II X3 435 Processor