Skip to content

Commit

Permalink
Remove unused French translations in Connect engine (#2252)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
anson1014 authored and LinuxJedi committed May 19, 2023
1 parent 956d6c4 commit c205f6c
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 2,739 deletions.
320 changes: 0 additions & 320 deletions storage/connect/frcas.h

This file was deleted.

46 changes: 0 additions & 46 deletions storage/connect/frids.h

This file was deleted.

320 changes: 0 additions & 320 deletions storage/connect/frmsg.h

This file was deleted.

1,013 changes: 0 additions & 1,013 deletions storage/connect/frmsg1.h

This file was deleted.

1,013 changes: 0 additions & 1,013 deletions storage/connect/frmsg2.h

This file was deleted.

4 changes: 0 additions & 4 deletions storage/connect/ha_connect.cc
Original file line number Diff line number Diff line change
Expand Up @@ -540,11 +540,7 @@ extern "C" const char *msglang(void)
#else // !XMSG && !NEWMSG
extern "C" const char *msglang(void)
{
#if defined(FRENCH)
return "french";
#else // DEFAULT
return "english";
#endif // DEFAULT
} // end of msglang
#endif // !XMSG && !NEWMSG

Expand Down
8 changes: 0 additions & 8 deletions storage/connect/messages.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
/**************************************************************************/
/* NLS messsages definition. */
/**************************************************************************/
#if defined(FRENCH)
#if defined(CPX)
#include "frmsg1.h"
#else /* not CPX */
#include "frmsg2.h"
#endif /* CPX */
#else /* not FRENCH */
#include "engmsg.h"
#endif /* FRENCH */
/* ---------------------------------------------------------------------- */
4 changes: 0 additions & 4 deletions storage/connect/plgdbsem.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@
/***********************************************************************/
/* DB Constant definitions. */
/***********************************************************************/
#if defined(FRENCH)
#define DEFAULT_LOCALE "French"
#else // !FRENCH
#define DEFAULT_LOCALE "English"
#endif // !FRENCH

#define DOS_MAX_PATH 144 /* Must be the same across systems */
#define DOS_BUFF_LEN 100 /* Number of lines in binary file buffer */
Expand Down
11 changes: 0 additions & 11 deletions storage/connect/rcmsg.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,6 @@ const char *GetMsgid(int id)
const char *p = NULL;

// This conditional until a real fix is found for MDEV-7304
#if defined(FRENCH)
if (!stricmp(msglang(), "french"))
switch (id) {
#include "frids.h"
#if defined(NEWMSG)
#include "frcas.h"
#endif // NEWMSG
} // endswitch(id)

else // English
#endif // FRENCH
switch (id) {
#include "enids.h"
#if defined(NEWMSG)
Expand Down

0 comments on commit c205f6c

Please sign in to comment.