Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Commit

Permalink
Add l10n title messages for edit btn and colors. (#4206) (#4265)
Browse files Browse the repository at this point in the history
  • Loading branch information
chenba authored and jaredhirsch committed Mar 26, 2018
1 parent 5aa2986 commit 81ab9ce
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 11 deletions.
20 changes: 20 additions & 0 deletions locales/en-US/server.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ shotPageAbuseButton =
.title = Report this shot for abuse, spam, or other problems
shotPageDownloadShot =
.title = Download
shotPageEditButton =
.title = Edit this image
shotPageDownload = Download
shotPageScreenshotsDescription = Screenshots made simple. Take, save, and share screenshots without leaving Firefox.
shotPageUpsellFirefox = Get Firefox now
Expand Down Expand Up @@ -192,6 +194,24 @@ annotationCropConfirmButton = Confirm
.title = Confirm selection
annotationCropCancelButton = Cancel
.title = Cancel selection
annotationColorWhite =
.title = White
annotationColorBlack =
.title = Black
annotationColorRed =
.title = Red
annotationColorGreen =
.title = Green
annotationColorBlue =
.title = Blue
annotationColorYellow =
.title = Yellow
annotationColorPurple =
.title = Purple
annotationColorSeaGreen =
.title = Sea Green
annotationColorGrey =
.title = Grey
## Shotindex page

Expand Down
38 changes: 28 additions & 10 deletions server/src/pages/shot/editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -780,19 +780,37 @@ class ColorPicker extends React.Component {
<div className="triangle-inner"></div>
</div>
<div className="color-row">
<div className="swatch" title="White" style={{backgroundColor: "#FFF", border: "1px solid #000"}} onClick={this.onClickSwatch.bind(this)}></div>
<div className="swatch" title="Black" style={{backgroundColor: "#000"}} onClick={this.onClickSwatch.bind(this)}></div>
<div className="swatch" title="Red" style={{backgroundColor: "#E74C3C"}} onClick={this.onClickSwatch.bind(this)}></div>
<Localized id="annotationColorWhite"><div className="swatch" title="White"
style={{ backgroundColor: "#FFF", border: "1px solid #000" }}
onClick={this.onClickSwatch.bind(this)}></div></Localized>
<Localized id="annotationColorBlack"><div className="swatch" title="Black"
style={{ backgroundColor: "#000" }}
onClick={this.onClickSwatch.bind(this)}></div></Localized>
<Localized id="annotationColorRed"><div className="swatch" title="Red"
style={{ backgroundColor: "#E74C3C" }}
onClick={this.onClickSwatch.bind(this)}></div></Localized>
</div>
<div className="color-row">
<div className="swatch" title="Green" style={{backgroundColor: "#2ECC71"}} onClick={this.onClickSwatch.bind(this)}></div>
<div className="swatch" title="Blue" style={{backgroundColor: "#3498DB"}} onClick={this.onClickSwatch.bind(this)}></div>
<div className="swatch" title="Yellow" style={{backgroundColor: "#FF0"}} onClick={this.onClickSwatch.bind(this)}></div>
<div className="color-row">
<Localized id="annotationColorGreen"><div className="swatch" title="Green"
style={{ backgroundColor: "#2ECC71" }}
onClick={this.onClickSwatch.bind(this)}></div></Localized>
<Localized id="annotationColorBlue"><div className="swatch" title="Blue"
style={{ backgroundColor: "#3498DB" }}
onClick={this.onClickSwatch.bind(this)}></div></Localized>
<Localized id="annotationColorYellow"><div className="swatch" title="Yellow"
style={{ backgroundColor: "#FF0" }}
onClick={this.onClickSwatch.bind(this)}></div></Localized>
</div>
<div className="color-row">
<div className="swatch" title="Purple" style={{backgroundColor: "#8E44AD"}} onClick={this.onClickSwatch.bind(this)}></div>
<div className="swatch" title="Sea Green" style={{backgroundColor: "#1ABC9C"}} onClick={this.onClickSwatch.bind(this)}></div>
<div className="swatch" title="Grey" style={{backgroundColor: "#34495E"}} onClick={this.onClickSwatch.bind(this)}></div>
<Localized id="annotationColorPurple"><div className="swatch" title="Purple"
style={{ backgroundColor: "#8E44AD" }}
onClick={this.onClickSwatch.bind(this)}></div></Localized>
<Localized id="annotationColorSeaGreen"><div className="swatch" title="Sea Green"
style={{ backgroundColor: "#1ABC9C" }}
onClick={this.onClickSwatch.bind(this)}></div></Localized>
<Localized id="annotationColorGrey"><div className="swatch" title="Grey"
style={{ backgroundColor: "#34495E" }}
onClick={this.onClickSwatch.bind(this)}></div></Localized>
</div>
</div>
}
Expand Down
4 changes: 3 additions & 1 deletion server/src/pages/shot/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,9 @@ class Body extends React.Component {
trashOrFlagButton = <Localized id="shotPageDeleteButton">
<button className="button transparent trash" title="Delete this shot permanently" onClick={ this.onClickDelete.bind(this) }></button>
</Localized>;
editButton = <button className="button transparent edit" title="Edit this image" onClick={ this.onClickEdit.bind(this) } ref={(edit) => { this.editButton = edit }}></button>
editButton = <Localized id="shotPageEditButton">
<button className="button transparent edit" title="Edit this image" onClick={ this.onClickEdit.bind(this) } ref={(edit) => { this.editButton = edit }}></button>
</Localized>;
} else {
trashOrFlagButton = <Localized id="shotPageAbuseButton">
<button className="button transparent flag" title="Report this shot for abuse, spam, or other problems" onClick={ this.onClickFlag.bind(this) }></button>
Expand Down

0 comments on commit 81ab9ce

Please sign in to comment.