Skip to content

Commit 84813c3

Browse files
authored
Remove unused French translations in Connect engine (#2252)
These files are currently not being used nor compiled in MariaDB. The use of large lists of 'case' statements in these source files are also not a great way to represent translated strings. This git history can be referred to when a better translation interface can be implemented in the future. Therefore, these files can be removed to cleanup the MariaDB codebase. All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc.
1 parent e27c3d5 commit 84813c3

File tree

9 files changed

+0
-2739
lines changed

9 files changed

+0
-2739
lines changed

storage/connect/frcas.h

Lines changed: 0 additions & 320 deletions
This file was deleted.

storage/connect/frids.h

Lines changed: 0 additions & 46 deletions
This file was deleted.

storage/connect/frmsg.h

Lines changed: 0 additions & 320 deletions
This file was deleted.

storage/connect/frmsg1.h

Lines changed: 0 additions & 1013 deletions
This file was deleted.

storage/connect/frmsg2.h

Lines changed: 0 additions & 1013 deletions
This file was deleted.

storage/connect/ha_connect.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -540,11 +540,7 @@ extern "C" const char *msglang(void)
540540
#else // !XMSG && !NEWMSG
541541
extern "C" const char *msglang(void)
542542
{
543-
#if defined(FRENCH)
544-
return "french";
545-
#else // DEFAULT
546543
return "english";
547-
#endif // DEFAULT
548544
} // end of msglang
549545
#endif // !XMSG && !NEWMSG
550546

storage/connect/messages.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
/**************************************************************************/
22
/* NLS messsages definition. */
33
/**************************************************************************/
4-
#if defined(FRENCH)
5-
#if defined(CPX)
6-
#include "frmsg1.h"
7-
#else /* not CPX */
8-
#include "frmsg2.h"
9-
#endif /* CPX */
10-
#else /* not FRENCH */
114
#include "engmsg.h"
12-
#endif /* FRENCH */
135
/* ---------------------------------------------------------------------- */

storage/connect/plgdbsem.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@
1414
/***********************************************************************/
1515
/* DB Constant definitions. */
1616
/***********************************************************************/
17-
#if defined(FRENCH)
18-
#define DEFAULT_LOCALE "French"
19-
#else // !FRENCH
2017
#define DEFAULT_LOCALE "English"
21-
#endif // !FRENCH
2218

2319
#define DOS_MAX_PATH 144 /* Must be the same across systems */
2420
#define DOS_BUFF_LEN 100 /* Number of lines in binary file buffer */

storage/connect/rcmsg.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@ const char *GetMsgid(int id)
3232
const char *p = NULL;
3333

3434
// This conditional until a real fix is found for MDEV-7304
35-
#if defined(FRENCH)
36-
if (!stricmp(msglang(), "french"))
37-
switch (id) {
38-
#include "frids.h"
39-
#if defined(NEWMSG)
40-
#include "frcas.h"
41-
#endif // NEWMSG
42-
} // endswitch(id)
43-
44-
else // English
45-
#endif // FRENCH
4635
switch (id) {
4736
#include "enids.h"
4837
#if defined(NEWMSG)

0 commit comments

Comments
 (0)