mirror of
https://gitlab.com/mishakmak/pam-fprint-grosshack.git
synced 2026-04-09 04:13:33 +02:00
Add string helper for results and fingers
Add a simple header file which can be copied to other projects to simplify i18n of results and strings.
This commit is contained in:
committed by
Daniel Drake
parent
43fe72a2aa
commit
9874ac4b91
@ -35,6 +35,9 @@
|
||||
|
||||
#include "marshal.h"
|
||||
|
||||
#define N_(x) x
|
||||
#include "fingerprint-strings.h"
|
||||
|
||||
#define MAX_TRIES 3
|
||||
#define TIMEOUT 30
|
||||
|
||||
@ -110,57 +113,6 @@ static void send_debug_msg(pam_handle_t *pamh, const char *msg)
|
||||
|
||||
}
|
||||
|
||||
struct {
|
||||
const char *dbus_name;
|
||||
const char *place_str;
|
||||
const char *swipe_str;
|
||||
} fingers[11] = {
|
||||
{ "left-thumb", "Place your left thumb on %s", "Swipe your left thumb on %s" },
|
||||
{ "left-index-finger", "Place your left index finger on %s", "Swipe your left index finger on %s" },
|
||||
{ "left-middle-finger", "Place your left middle finger on %s", "Swipe your left middle finger on %s" },
|
||||
{ "left-ring-finger", "Place your left ring finger on %s", "Swipe your left ring finger on %s" },
|
||||
{ "left-little-finger", "Place your left little finger on %s", "Swipe your left little finger on %s" },
|
||||
{ "right-thumb", "Place your right thumb on %s", "Swipe your right thumb on %s" },
|
||||
{ "right-index-finger", "Place your right index finger on %s", "Swipe your right index finger on %s" },
|
||||
{ "right-middle-finger", "Place your right middle finger on %s", "Swipe your right middle finger on %s" },
|
||||
{ "right-ring-finger", "Place your right ring finger on %s", "Swipe your right ring finger on %s" },
|
||||
{ "right-little-finger" "Place your right little finger on %s", "Swipe your right little finger on %s" },
|
||||
{ NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
static const char *fingerstr(const char *finger_name, gboolean is_swipe)
|
||||
{
|
||||
guint i;
|
||||
|
||||
for (i = 0; fingers[i].dbus_name != NULL; i++) {
|
||||
if (g_str_equal (fingers[i].dbus_name, finger_name)) {
|
||||
if (is_swipe == FALSE)
|
||||
return fingers[i].place_str;
|
||||
else
|
||||
return fingers[i].swipe_str;
|
||||
}
|
||||
}
|
||||
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
static const char *resulstr(const char *result, gboolean is_swipe)
|
||||
{
|
||||
if (g_str_equal (result, "verify-retry-scan")) {
|
||||
if (is_swipe == FALSE)
|
||||
return "Place your finger on the reader again";
|
||||
else
|
||||
return "Swipe your finger again";
|
||||
}
|
||||
if (g_str_equal (result, "verify-swipe-too-short"))
|
||||
return "Swipe was too short, try again";
|
||||
if (g_str_equal (result, "verify-finger-not-centered"))
|
||||
return "Your finger was not centered, try swiping your finger again";
|
||||
if (g_str_equal (result, "verify-remove-and-retry"))
|
||||
return "Remove your finger, and try swiping your finger again";
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
static DBusGProxy *create_manager (pam_handle_t *pamh, DBusGConnection **ret_conn, GMainLoop **ret_loop)
|
||||
{
|
||||
DBusGConnection *connection;
|
||||
@ -262,7 +214,7 @@ static void verify_result(GObject *object, const char *result, gboolean done, gp
|
||||
return;
|
||||
}
|
||||
|
||||
msg = resulstr (result, data->is_swipe);
|
||||
msg = verify_result_str_to_msg (result, data->is_swipe);
|
||||
send_err_msg (data->pamh, msg);
|
||||
}
|
||||
|
||||
@ -277,7 +229,7 @@ static void verify_finger_selected(GObject *object, const char *finger_name, gpo
|
||||
else
|
||||
msg = g_strdup_printf ("Swipe your finger on %s", data->driver);
|
||||
} else {
|
||||
msg = g_strdup_printf (fingerstr(finger_name, data->is_swipe), data->driver);
|
||||
msg = g_strdup_printf (finger_str_to_msg(finger_name, data->is_swipe), data->driver);
|
||||
}
|
||||
D(data->pamh, "verify_finger_selected %s", msg);
|
||||
send_info_msg (data->pamh, msg);
|
||||
|
||||
Reference in New Issue
Block a user