Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

704: Add glossary tooltips after editing a row. #705

Closed
wants to merge 2 commits into from
Closed

704: Add glossary tooltips after editing a row. #705

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20adb8a
Add glossary tooltips after editing a row.
toolstack Apr 27, 2017
4a4e20d
Use the same function to get the glossary as in translation_get().
toolstack May 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions gp-includes/routes/translation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@ public function translations_post( $project_path, $locale_slug, $translation_set
return $this->die_with_404();
}

$glossary = $this->get_extended_glossary( $translation_set, $project );

$output = array();
foreach( gp_post( 'translation', array() ) as $original_id => $translations) {
$data = compact('original_id');
Expand Down Expand Up @@ -315,6 +317,12 @@ public function translations_post( $project_path, $locale_slug, $translation_set
$translations = GP::$translation->for_translation( $project, $translation_set, 'no-limit', array('translation_id' => $translation->id), array() );

if ( ! empty( $translations ) ) {
if ( $glossary ) {
require_once GP_TMPL_PATH . 'helper-functions.php';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since map_glossary_entries_to_translations_originals() is currently a template function there's no guarantee that the function exists. Maybe it shouldn't be a template function? Would gp-includes/template.php be a better place?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be a template function as it's creating html for the front end to use. A custom template might want to change it from a tooltip to something else and need different markup to do it.

I'd say if someone has created a new theme and template functions that it would have to support all functions in the helper file to properly support outputting the glossary markup.

The other way to do this, which might be logically cleaner, would be to create a new template "translation-row-ajax.php" which would call map_glossary_entries_to_translations_originals() from inside of it to keep all of the template logic inside the template directory.


$translations = map_glossary_entries_to_translations_originals( $translations, $glossary );
}

$t = $translations[0];

$can_edit = $this->can( 'edit', 'translation-set', $translation_set->id );
Expand Down