Cortex: fix the catalog location of the main application

Previously, hrev55011 introduced localization for Cortex, which then
prompted to close #7530. It has then been reopened, when it turns out
that the translations for the container application (RouteApp) did not
work, whereas the individual add-ons/modules were translated.

The cause is that by default BCatalog looks up the translations based on
the subtype part of the signature. This is x-vnd.Cortex.Route (without
the application/ supertype). This change will place the translations in
the right place of the file system.

The add-ons were never affected, since they BCatalog is explicitly told
to find the translations for the entire signature, like:

static BCatalog sCatalog("application/x-vnd.Cortex.InfoView");

Even so, it was chosen to omit the `application` supertype from the
signature for the shared code as well.

This should fix #7530 for good.

Change-Id: Iff18fabef7aba68602e49db1e98cfed2f486f545
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4091
Reviewed-by: Niels Sascha Reedijk <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
Niels Sascha Reedijk
2021-06-17 10:59:18 +00:00
parent 324b426da9
commit bf6a2a2bf1
31 changed files with 31 additions and 31 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ Application CortexAddOnHost :
; ;
DoCatalogs CortexAddOnHost : DoCatalogs CortexAddOnHost :
application/x-vnd.Cortex.AddOnHost x-vnd.Cortex.AddOnHost
: :
AddOnHostApp.cpp AddOnHostApp.cpp
; ;
@@ -63,7 +63,7 @@ __USE_CORTEX_NAMESPACE
#define D_OPERATION(x) //PRINT (x) // operations #define D_OPERATION(x) //PRINT (x) // operations
#define D_COMPARE(x) //PRINT (x) // compare functions #define D_COMPARE(x) //PRINT (x) // compare functions
static BCatalog sCatalog("application/x-vnd.Cortex.DormantNodeView"); static BCatalog sCatalog("x-vnd.Cortex.DormantNodeView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// constants // constants
@@ -59,7 +59,7 @@ __USE_CORTEX_NAMESPACE
#define D_MESSAGE(x) //PRINT (x) // MessageReceived() #define D_MESSAGE(x) //PRINT (x) // MessageReceived()
#define D_INTERNAL(x) //PRINT (x) // internal operations #define D_INTERNAL(x) //PRINT (x) // internal operations
static BCatalog sCatalog("application/x-vnd.Cortex.DormantNodeView"); static BCatalog sCatalog("x-vnd.Cortex.DormantNodeView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// constants // constants
+1 -1
View File
@@ -16,7 +16,7 @@ StaticLibrary cortex_dormant_node_view.a :
; ;
DoCatalogs cortex_dormant_node_view.a : DoCatalogs cortex_dormant_node_view.a :
application/x-vnd.Cortex.DormantNodeView x-vnd.Cortex.DormantNodeView
: :
DormantNodeListItem.cpp DormantNodeListItem.cpp
DormantNodeWindow.cpp DormantNodeWindow.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ __USE_CORTEX_NAMESPACE
#include <Debug.h> #include <Debug.h>
#define D_METHOD(x) //PRINT (x) #define D_METHOD(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.InfoView"); static BCatalog sCatalog("x-vnd.Cortex.InfoView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// *** ctor/dtor (public) // *** ctor/dtor (public)
@@ -56,7 +56,7 @@ __USE_CORTEX_NAMESPACE
#define D_METHOD(x) //PRINT (x) #define D_METHOD(x) //PRINT (x)
#define D_MESSAGE(x) //PRINT (x) #define D_MESSAGE(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.InfoView"); static BCatalog sCatalog("x-vnd.Cortex.InfoView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// *** ctor/dtor (public) // *** ctor/dtor (public)
@@ -54,7 +54,7 @@ __USE_CORTEX_NAMESPACE
#include <Debug.h> #include <Debug.h>
#define D_METHOD(x) //PRINT (x) #define D_METHOD(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.InfoView"); static BCatalog sCatalog("x-vnd.Cortex.InfoView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// *** ctor/dtor (public) // *** ctor/dtor (public)
@@ -51,7 +51,7 @@ __USE_CORTEX_NAMESPACE
#include <Debug.h> #include <Debug.h>
#define D_METHOD(x) //PRINT (x) #define D_METHOD(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.InfoView"); static BCatalog sCatalog("x-vnd.Cortex.InfoView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// *** ctor/dtor (public) // *** ctor/dtor (public)
@@ -53,7 +53,7 @@ __USE_CORTEX_NAMESPACE
#include <Debug.h> #include <Debug.h>
#define D_METHOD(x) //PRINT (x) #define D_METHOD(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.InfoView"); static BCatalog sCatalog("x-vnd.Cortex.InfoView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// *** ctor/dtor (public) // *** ctor/dtor (public)
+1 -1
View File
@@ -63,7 +63,7 @@ __USE_CORTEX_NAMESPACE
#define D_ACCESS(X) //PRINT (x) // Accessors #define D_ACCESS(X) //PRINT (x) // Accessors
#define D_METHOD(x) //PRINT (x) #define D_METHOD(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.InfoView"); static BCatalog sCatalog("x-vnd.Cortex.InfoView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// *** internal class: _InfoTextField // *** internal class: _InfoTextField
+1 -1
View File
@@ -19,7 +19,7 @@ StaticLibrary cortex_info_view.a :
; ;
DoCatalogs cortex_info_view.a : DoCatalogs cortex_info_view.a :
application/x-vnd.Cortex.InfoView x-vnd.Cortex.InfoView
: :
AppNodeInfoView.cpp AppNodeInfoView.cpp
ConnectionInfoView.cpp ConnectionInfoView.cpp
@@ -61,7 +61,7 @@ __USE_CORTEX_NAMESPACE
#define D_METHOD(x) //PRINT (x) #define D_METHOD(x) //PRINT (x)
#define D_MESSAGE(x) //PRINT (x) #define D_MESSAGE(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.InfoView"); static BCatalog sCatalog("x-vnd.Cortex.InfoView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// *** ctor/dtor (public) // *** ctor/dtor (public)
+1 -1
View File
@@ -23,7 +23,7 @@ StaticLibrary cortex_media_routing_view.a :
; ;
DoCatalogs cortex_media_routing_view.a : DoCatalogs cortex_media_routing_view.a :
application/x-vnd.Cortex.MediaRoutingView x-vnd.Cortex.MediaRoutingView
: :
MediaJack.cpp MediaJack.cpp
MediaNodePanel.cpp MediaNodePanel.cpp
@@ -66,7 +66,7 @@ __USE_CORTEX_NAMESPACE
#define D_DRAW(x) //PRINT (x) #define D_DRAW(x) //PRINT (x)
#define D_MOUSE(x) //PRINT (x) #define D_MOUSE(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.MediaRoutingView"); static BCatalog sCatalog("x-vnd.Cortex.MediaRoutingView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// constants // constants
@@ -79,7 +79,7 @@ __USE_CORTEX_NAMESPACE
#define D_MESSAGE(x) //PRINT (x) #define D_MESSAGE(x) //PRINT (x)
#define D_DRAW(x) //PRINT (x) #define D_DRAW(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.MediaRoutingView"); static BCatalog sCatalog("x-vnd.Cortex.MediaRoutingView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// constants // constants
@@ -87,7 +87,7 @@ __USE_CORTEX_NAMESPACE
#define D_MOUSE(x) //PRINT (x) #define D_MOUSE(x) //PRINT (x)
#define D_KEY(x) //PRINT (x) #define D_KEY(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.MediaRoutingView"); static BCatalog sCatalog("x-vnd.Cortex.MediaRoutingView");
// ---------------------------------------------------------------- // // ---------------------------------------------------------------- //
// constants // constants
@@ -66,7 +66,7 @@ __USE_CORTEX_NAMESPACE
#define D_DRAW(x) //PRINT (x) #define D_DRAW(x) //PRINT (x)
#define D_MOUSE(x) //PRINT (x) #define D_MOUSE(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.MediaRoutingView"); static BCatalog sCatalog("x-vnd.Cortex.MediaRoutingView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// constants // constants
+1 -1
View File
@@ -16,7 +16,7 @@ StaticLibrary cortex_node_manager.a :
; ;
DoCatalogs cortex_node_manager.a : DoCatalogs cortex_node_manager.a :
application/x-vnd.Cortex.NodeManager x-vnd.Cortex.NodeManager
: :
NodeManager.cpp NodeManager.cpp
; ;
+1 -1
View File
@@ -68,7 +68,7 @@ __USE_CORTEX_NAMESPACE
#define D_ROSTER(x) //PRINT (x) #define D_ROSTER(x) //PRINT (x)
#define D_LOCK(x) //PRINT (x) #define D_LOCK(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.NodeManager"); static BCatalog sCatalog("x-vnd.Cortex.NodeManager");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// messaging constants // messaging constants
+1 -1
View File
@@ -13,7 +13,7 @@ StaticLibrary cortex_parameter_view.a :
; ;
DoCatalogs cortex_parameter_view.a : DoCatalogs cortex_parameter_view.a :
application/x-vnd.Cortex.ParameterView x-vnd.Cortex.ParameterView
: :
ParameterWindow.cpp ParameterWindow.cpp
; ;
@@ -70,7 +70,7 @@ __USE_CORTEX_NAMESPACE
#define D_INTERNAL(x) //PRINT (x) #define D_INTERNAL(x) //PRINT (x)
#define D_MESSAGE(x) //PRINT (x) #define D_MESSAGE(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.ParameterView"); static BCatalog sCatalog("x-vnd.Cortex.ParameterView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// ctor/dtor // ctor/dtor
+1 -1
View File
@@ -46,7 +46,7 @@ Application Cortex :
; ;
DoCatalogs Cortex : DoCatalogs Cortex :
application/x-vnd.Cortex.Route x-vnd.Cortex.Route
: :
RouteAppNodeManager.cpp RouteAppNodeManager.cpp
RouteWindow.cpp RouteWindow.cpp
+1 -1
View File
@@ -13,7 +13,7 @@ StaticLibrary cortex_tip_manager.a :
; ;
DoCatalogs cortex_tip_manager.a : DoCatalogs cortex_tip_manager.a :
application/x-vnd.Cortex.TipManager x-vnd.Cortex.TipManager
: :
TipWindow.cpp TipWindow.cpp
; ;
+1 -1
View File
@@ -45,7 +45,7 @@
__USE_CORTEX_NAMESPACE __USE_CORTEX_NAMESPACE
static BCatalog sCatalog("application/x-vnd.Cortex.TipManager"); static BCatalog sCatalog("x-vnd.Cortex.TipManager");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// *** dtor/ctors // *** dtor/ctors
+1 -1
View File
@@ -15,7 +15,7 @@ StaticLibrary cortex_transport_view.a :
; ;
DoCatalogs cortex_transport_view.a : DoCatalogs cortex_transport_view.a :
application/x-vnd.Cortex.TransportView x-vnd.Cortex.TransportView
: :
TransportView.cpp TransportView.cpp
; ;
@@ -70,7 +70,7 @@ using namespace std;
__USE_CORTEX_NAMESPACE __USE_CORTEX_NAMESPACE
static BCatalog sCatalog("application/x-vnd.Cortex.TransportView"); static BCatalog sCatalog("x-vnd.Cortex.TransportView");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// _GroupInfoView // _GroupInfoView
+1 -1
View File
@@ -25,7 +25,7 @@ Addon cortex_audioadapter.media_addon :
; ;
DoCatalogs cortex_audioadapter.media_addon DoCatalogs cortex_audioadapter.media_addon
: application/x-vnd.moon-AudioAdapter.media_addon : x-vnd.moon-AudioAdapter.media_addon
: :
AudioAdapterParams.cpp AudioAdapterParams.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ Addon cortex_flanger.media_addon :
; ;
DoCatalogs cortex_flanger.media_addon DoCatalogs cortex_flanger.media_addon
: application/x-vnd.moon-Flanger.media_addon : x-vnd.moon-Flanger.media_addon
: :
FlangerAddOn.cpp FlangerAddOn.cpp
FlangerNode.cpp FlangerNode.cpp
@@ -18,7 +18,7 @@ Addon cortex_logging_consumer.media_addon :
; ;
DoCatalogs cortex_logging_consumer.media_addon DoCatalogs cortex_logging_consumer.media_addon
: application/x-vnd.Be.LoggingConsumerApp : x-vnd.Be.LoggingConsumerApp
: :
LoggingConsumer.cpp LoggingConsumer.cpp
LoggingConsumerAddOn.cpp LoggingConsumerAddOn.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ StaticLibrary cortex_support.a :
; ;
DoCatalogs cortex_support.a : DoCatalogs cortex_support.a :
application/x-vnd.Cortex.support x-vnd.Cortex.support
: :
MediaString.cpp MediaString.cpp
; ;
+1 -1
View File
@@ -51,7 +51,7 @@ __USE_CORTEX_NAMESPACE
#include <Debug.h> #include <Debug.h>
#define D_METHOD(x) //PRINT (x) #define D_METHOD(x) //PRINT (x)
static BCatalog sCatalog("application/x-vnd.Cortex.support"); static BCatalog sCatalog("x-vnd.Cortex.support");
// -------------------------------------------------------- // // -------------------------------------------------------- //
// *** media_node strings (public) // *** media_node strings (public)