This repository has been archived by the owner on Oct 29, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 22
DoSomething js i18n: wrap hardcoded strings into Drupal.t(). #2928
Merged
sergiitk
merged 6 commits into
DoSomething:dev
from
sergiitk:intl-javascript-translation
Aug 1, 2014
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
92d63f3
DoSomething js i18n: wrap hardcoded strings into Drupal.t().
6255077
Fixes spelling.
c65831e
Fixes #2930 conflict.
76e7533
Merge pull request #2932 from weerd/modal--number-validation-update
weerd 0bd97cb
Fixes #2932 conflict.
8e7b966
Add Drupal object to Grunt js globals.
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,6 +21,7 @@ | |
"DEBUG": false, | ||
"jQuery": false, | ||
"$": false, | ||
"Drupal": false, | ||
"_gaq": false | ||
}, | ||
"strict": true, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
lib/themes/dosomething/paraneue_dosomething/js/finder/templates/campaign.tpl.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
lib/themes/dosomething/paraneue_dosomething/js/finder/templates/error.tpl.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
<div class="messages error">Ooof! We're not sure what's up? Maybe it's us, or it could be your internet connection. Want to try again in a few minutes?</div> | ||
<div class="messages error"> | ||
<%= Drupal.t("Ooof! We're not sure what's up? Maybe it's us, or it could be your internet connection. Want to try again in a few minutes?") %> | ||
</div> |
8 changes: 6 additions & 2 deletions
8
lib/themes/dosomething/paraneue_dosomething/js/finder/templates/no-results.tpl.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,10 @@ | ||
<div class="no-result"> | ||
<div class="wrapper"> | ||
<p class="message ">Oh snap! We'll work on that.</p> | ||
<p><a id="reset-filters" href="/">Want to try another combo?</a></p> | ||
<p class="message"><%= Drupal.t("Oh snap! We'll work on that.") %></p> | ||
<p> | ||
<a id="reset-filters" href="/"> | ||
<%= Drupal.t("Want to try another combo?") %> | ||
</a> | ||
</p> | ||
</div> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This isn't really a user facing error. Not sure if they need to be translated, but I'm assuming it won't hurt if they are. Just pointing it out ;)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you! That's exactly the way I was thinking I was deciding if I should wrap it into
Drupal.t
.