Skip to content

Commit

Permalink
Merge branch 'master' into feat/web/post-bksp-reversion
Browse files Browse the repository at this point in the history
  • Loading branch information
Joshua Horton committed Jan 15, 2025
2 parents c32f7d0 + da5152f commit 186b1fb
Show file tree
Hide file tree
Showing 35 changed files with 3,425 additions and 80 deletions.
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Keyman Version History

## 18.0.166 alpha 2025-01-10

* fix(web): numpad + and - with zoom shortcut use (#12865)

## 18.0.165 alpha 2025-01-09

* feat(web): add KeymanWeb API for auto-correct (#12857)
Expand Down
2 changes: 1 addition & 1 deletion VERSION.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.0.166
18.0.167
20 changes: 16 additions & 4 deletions android/KMAPro/kMAPro/src/main/res/values-es-rES/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@
<!-- Context: Textfield prompt (&#8230; is the ellipsis character "...") -->
<string name="textview_hint" comment="Prompt to start typing">Escriba aquí&#8230;</string>
<!-- Context: Splash screen (version/copyright info currently disabled -->
<string name="splash_blank" translatable="false" comment="Blank text while version info on splash page is disabled"></string>
<!-- Context: Splash screen (version/copyright info currently disabled -->
<!-- Context: Text Size dialog -->
<string name="text_size" comment="Current text size (number)">Tamaño del texto: %1$d</string>
<!-- Context: Text Size dialog -->
<string name="ic_text_size_up" comment="Make text bigger">Agrandar texto</string>
<!-- Context: Text Size dialog -->
<string name="ic_text_size_down" comment="Make text smaller">Achicar texto</string>
<!-- Context: Text Size dialog -->
<string name="ic_text_size_slider" comment="Adjust text size">Control deslizante de tamaño de texto</string>
<!-- Context: Clear Text dialog -->
<string name="all_text_will_be_cleared" comment="Erase all the text">\nTodo el texto será borrado\n</string>
<!-- Context: Get Started menu -->
Expand All @@ -52,6 +53,7 @@
<string name="request_storage_permission" comment="Request storage permission to access keyboard packages"> Para instalar los paquetes de teclado, permita que Keyman acceda al almacenamiento externo.</string>
<!-- Context: Android Storage Permission -->
<string name="storage_permission_denied" comment="Keyboard package installation may fail since Android storage permission not granted"> Se ha denegado la solicitud de permiso de almacenamiento. La instalación del paquete de teclado podría fallar</string>
<string name="storage_permission_denied2" comment="Keyboard package installation failed. Recommend install from local file"> Fallo en la solicitud de permiso de almacenamiento. Pruebe Configuración de Keyman - Instalar desde archivo local</string>
<!-- Context: Keyman Settings menu -->
<string name="keyman_settings" comment="Settings menu title">Configuración</string>
<!-- Context: Keyman Settings menu -->
Expand All @@ -66,6 +68,8 @@
<!-- Context: Keyman Settings menu -->
<string name="adjust_keyboard_height" comment="Menu action to adjust keyboard height">Ajustar altura del teclado</string>
<!-- Context: Keyman Settings menu -->
<string name="adjust_longpress_delay" comment="Menu action to adjust longpress delay duration">Ajustar demora de pulsación larga</string>
<!-- Context: Keyman Settings menu -->
<string name="spacebar_caption" comment="Menu action to set the spacebar caption">Leyenda del teclado</string>
<!-- Context: Keyman Settings menu / Spacebar caption -->
<string name="spacebar_caption_keyboard" comment="Spacebar caption option - keyboard">Teclado</string>
Expand All @@ -85,11 +89,11 @@
<string name="spacebar_caption_hint_blank" comment="Spacebar caption hint - blank">No mostrar leyenda en la barra espaciadora</string>
<!-- Context: Keyman Settings menu / Haptic feedback -->
<string name="haptic_feedback" comment="haptic feedback on key press">Vibrar al escribir</string>
<!-- Context: Keyman Settings menu -->
<!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
<string name="show_banner" comment="text suggestions banner">Mostrar siempre el banner</string>
<!-- Context: Keyman Settings menu -->
<!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
<string name="show_banner_on" comment="Description when toggle is on">Próximamente implementado</string>
<!-- Context: Keyman Settings menu -->
<!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
<string name="show_banner_off" comment="Description when toggle is off">Cuando esté desactivado, sólo mostrado cuando el texto predictivo esté habilitado</string>
<!-- Context: Keyman Settings menu -->
<string name="show_send_crash_report" comment="permission for sending crash reports">Permitir el envío de informes de fallos a través de la red</string>
Expand Down Expand Up @@ -121,6 +125,14 @@
<string name="rotate_the_device" comment="Second line of adjusting keyboard height">Rotar el dispositivo para ajustar a modo vertical u horizontal</string>
<!-- Context: Adjust Keyboard Height menu -->
<string name="reset_to_defaults" comment="Button to reset to default heights">Restablecer valores predeterminados</string>
<!-- Context: Adjust Longpress Delay Time menu -->
<string name="longpress_delay_time" comment="Current longpress delay time (seconds)">Tiempo de retraso: %1$.1f segundos</string>
<!-- Context: Adjust Longpress Delay Time menu -->
<string name="ic_delay_time_up" comment="Make longpress delay longer">Tiempo de retraso más largo</string>
<!-- Context: Adjust Longpress Delay Time menu -->
<string name="ic_delay_time_down" comment="Make longpress delay shorter">Tiempo de retraso más corto</string>
<!-- Context: Adjust Longpress Delay Time menu -->
<string name="ic_longpress_delay_slider" comment="Adjust longpress delay time">Deslizador de tiempo de retraso de pulsación larga</string>
<!-- Context: Keyman Web Browser -->
<string name="hint_text" comment="Prompt to type in the browser search bar">Buscar o escribir una dirección web</string>
<!-- Context: Keyman Web Browser -->
Expand Down
13 changes: 9 additions & 4 deletions android/KMEA/app/src/main/res/values-es-rES/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<string name="dictionary_download_start_in_background" comment="Notification that a dictionary download has started">La descarga del diccionario inició en segundo plano</string>
<!-- Context: Background download messages-->
<string name="dictionary_download_is_running_in_background" comment="Notification that a dictionary download is still running">El diccionario seleccionado ya se está descargando; ¡por favor, inténtalo de nuevo en un momento!</string>
<!-- Context: Background download messages-->
<!-- Context: Background download messages. Removed in Keyman 17-->
<string name="dictionary_download_finished" comment="Notification that a dictionary download has finished">La descarga del diccionario ha finalizado.</string>
<!-- Context: Background download messages -->
<string name="download_failed" comment="Notification that a download failed">Descargar falló</string>
Expand All @@ -119,7 +119,7 @@
<string name="update_check_current" comment="Notification that all resources are up to date">"¡Todos los recursos están actualizados!"</string>
<!-- Context: General Updates -->
<string name="update_failed" comment="Notification that a resource update failed">¡Uno o más recursos no se han actualizado!</string>
<!-- Context: General Updates -->
<!-- Context: General Updates. Removed in Keyman 17 -->
<string name="update_success" comment="Notification that a resource update successfully updated">¡Recursos actualizados con éxito!</string>
<!-- Context: Model Info -->
<string name="model_version" comment="Title for a dictionary version">Versión del diccionario</string>
Expand All @@ -133,10 +133,15 @@
<string name="keyboard_install_toast" comment="Notification when a keyboard is installed">Teclado %1$s instalado</string>
<!-- Context: Language Settings Keyboard uninstall strings -->
<string name="keyboard_deleted_toast" comment="Notification when a keyboard is deleted">Teclado eliminado</string>
<!-- Context: Language Settings menu strings -->
<!-- Context: Language Settings menu strings. Removed in Keyman 18 -->
<string name="enable_corrections" comment="Enable corrections from the suggestion banner">Habilitar correcciones</string>
<!-- Context: Language Settings menu strings -->
<!-- Context: Language Settings menu strings. Removed in Keyman 18 -->
<string name="enable_predictions" comment="Enable predictions from the suggestion banner">Habilitar predicciones</string>
<!-- Context: Language Settings menu strings - radio buttons -->
<string name="suggestions_radio_0" comment="Predictions and corrections disabled">Desactivar sugerencias</string>
<string name="suggestions_radio_1" comment="Suggestions Enabled: Predictions with no corrections">Sólo predicciones</string>
<string name="suggestions_radio_2" comment="Suggestions Enabled: Predictions with corrections">Predicciones con correcciones</string>
<string name="suggestions_radio_3" comment="Suggestions Enabled: Predictions with auto-corrections">Predicciones con autocorrecciones</string>
<!-- Context: Language Settings menu strings -->
<string name="model_label">Diccionario</string>
<plurals name="model_count">
Expand Down
10 changes: 5 additions & 5 deletions core/docs/api/options.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ value.

-------------------------------------------------------------------------------

# km_core_option_scope enum {#km_core_option_scope}
# km_core_option_scope enum

## Description

Expand Down Expand Up @@ -48,7 +48,7 @@ enum km_core_option_scope {

-------------------------------------------------------------------------------

# km_core_option_item struct {#km_core_option_item}
# km_core_option_item struct

## Description

Expand Down Expand Up @@ -78,7 +78,7 @@ struct km_core_option_item {
-------------------------------------------------------------------------------
# km_core_options_list_size() {#km_core_options_list_size}
# km_core_options_list_size()
## Description
Return the length of a terminated [km_core_option_item] array (options
Expand Down Expand Up @@ -150,7 +150,7 @@ km_core_state_option_lookup(km_core_state const *state,
-------------------------------------------------------------------------------
# km_core_state_options_update() {#km_core_state_options_update}
# km_core_state_options_update()
## Description
Expand Down Expand Up @@ -188,7 +188,7 @@ km_core_state_options_update(km_core_state *state,

-------------------------------------------------------------------------------

# km_core_state_options_to_json() {#km_core_state_options_to_json}
# km_core_state_options_to_json()

## Description

Expand Down
34 changes: 18 additions & 16 deletions developer/docs/help/context/keyboard-editor.md
Original file line number Diff line number Diff line change
Expand Up @@ -382,22 +382,24 @@ ID
required, and a default code will usually be generated automatically
by Keyman Developer.

- `K_xxxx` is used for a standard Keyman for Windows's key name, e.g.
`K_W`, `K_ENTER`. You cannot make up your own `K_xxxx` names.
Many of the `K_` ids have overloaded output behaviour, for
instance, if no rule is matched for `K_W`, Keyman will output
'w' when it is touched. The standard key names are listed in
[Virtual Keys and Virtual Character Keys](/developer/language/guide/virtual-keys). Typically,
you would use only the "common" virtual ID.
- `T_xxxx` is used for any user defined names, e.g. `T_SCHWA`.
If you wanted to use it, `T_ENTER` would also be valid. If no
rule matches it, the key will have no output behaviour.
- `U_####[_####]` is used as a shortcut for a key that
will output those Unicode values, if no rule matches it. This is
similar to the overloaded behaviour for `K_` ids. Thus `####`
must be valid Unicode characters. E.g. `U_0259` would generate a
schwa if no rule matches. It is still valid to have a rule such
as `+ [U_0259] > ...`
- `K_xxxx` is used for a standard Keyman for Windows's key name, e.g.
`K_W`, `K_ENTER`. You cannot make up your own `K_xxxx` names.
Many of the `K_` ids have overloaded output behaviour, for
instance, if no rule is matched for `K_W`, Keyman will output
'w' when it is touched. The standard key names are listed in
[Virtual Keys and Virtual Character Keys](/developer/language/guide/virtual-keys). Typically,
you would use only the "common" virtual ID.
- `T_xxxx` is used for any user defined names, e.g. `T_SCHWA`.
If you wanted to use it, `T_ENTER` would also be valid. If no
rule matches it, the key will have no output behaviour.
- `U_####[_####]` is used as a shortcut for a key that
will output those Unicode values, if no rule matches it. This is
similar to the overloaded behaviour for `K_` ids. Thus `####`
must be valid Unicode characters.
The square bracket characters `[` and `]` indicate an optional portion of the sequence
and are not to be included in the shortcut. E.g. `U_0259` would generate a
schwa if no rule matches. It is still valid to have a rule such
as `+ [U_0259] > ...`

Padding Left
: Padding to the left of each key can be adjusted, and specified as a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ Character Keys"). Typically, you would use only the "common" virtual key

- `U_####[_####]` is used as a shortcut for a key that will output those
Unicode values, if no rule matches it. This is similar to the overloaded
behaviour for `K_` ids. Thus `####` must be valid Unicode characters. E.g.
behaviour for `K_` ids. Thus `####` must be valid Unicode characters.
The square bracket characters `[` and `]` indicate an optional portion of the sequence
and are not to be included in the shortcut. E.g.
`U_0259` would generate a schwa if no rule matches. It is still valid to
have a rule such as `+ [U_0259] > ...`

Expand Down
2 changes: 1 addition & 1 deletion developer/docs/help/guides/distribute/tutorial/step-2.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ welcome.htm
> ### Tip
If you want links to your website to open in the user's preferred
browser, preface the href link with `link:`, e.g.
`<a href="http://keyman.com/">website</a>`
`<a href="https://keyman.com/">website</a>`
The `link:` sceheme will open the referred file in the default
application - that is, a web browser for URLs and links, Notepad for
.txt files, Adobe Reader for PDFs. You can use `link:` to open any
Expand Down
2 changes: 1 addition & 1 deletion developer/docs/help/guides/distribute/tutorial/step-4.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Website

: Enter the name of the website where you will have information about
this keyboard. If you want to host it on keyman.com, you could enter
`http://www.keyman.com/`
`https://keyman.com/`

Image file
: Select the splash image file that you created in Step 2 from the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ recommendations:
ZIP archive file!) and you won't save much space by recompressing
it.
3. Include a link to the Keyman download page:
`http://keyman.com/downloads/`
`https://keyman.com/downloads/`

## Distributing a package by email

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ Character Keys"). Typically, you would use only the "common" virtual key

- `U_####[_####]` is used as a shortcut for a key that will output those
Unicode values, if no rule matches it. This is similar to the overloaded
behaviour for `K_` ids. Thus `####` must be valid Unicode characters. E.g.
behaviour for `K_` ids. Thus `####` must be valid Unicode characters.
The square bracket characters `[` and `]` indicate an optional portion of the sequence
and are not to be included in the shortcut. E.g.
`U_0259` would generate a schwa if no rule matches. It is still valid to
have a rule such as `+ [U_0259] > ...`

Expand Down
17 changes: 11 additions & 6 deletions developer/src/common/web/utils/src/utils/KeymanSentry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,19 @@ export class KeymanSentry {

static async captureException(e: any): Promise<never> {
if(isInit) {
// For local development, we don't want to bury the trace; we need the cast to avoid
// TS2367 (comparison appears to be unintentional)
if((KEYMAN_VERSION.VERSION_ENVIRONMENT as string) == 'local') {
throw e;
}

const eventId = Sentry.captureException(e);
process.stderr.write(`
Fatal error: ${(e??'').toString()}
`);
this.writeSentryMessage(eventId);
await this.close();

// For local development, we don't want to bury the trace; we need the cast to avoid
// TS2367 (comparison appears to be unintentional)
if((KEYMAN_VERSION.VERSION_ENVIRONMENT as string) == 'local') {
throw e;
}
process.exit(1);
} else {
throw e;
Expand All @@ -86,7 +87,11 @@ export class KeymanSentry {

static async close() {
if(isInit) {
await Sentry.close(CLOSE_TIMEOUT);
try {
await Sentry.close(CLOSE_TIMEOUT);
} catch(e) {
// ignore any errors here
}
}
}
}
Loading

0 comments on commit 186b1fb

Please sign in to comment.