Skip to content

Commit

Permalink
Staging (#398)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lungsangg authored Oct 12, 2024
2 parents 8cdf5d2 + c2a4193 commit f48da10
Show file tree
Hide file tree
Showing 14 changed files with 292 additions and 103 deletions.
Binary file modified locale/en/LC_MESSAGES/django.mo
Binary file not shown.
12 changes: 9 additions & 3 deletions locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -1048,9 +1048,15 @@ msgstr ""
msgid "Older Activity"
msgstr ""

#: templates/elements/login_prompt.html:6
#: templates/registration/register.html:13
msgid "Sign_Up_Title"
msgstr "Sign Up"

#: templates/registration/register.html:22
msgid "Sign_Up_Button"
msgstr "Sign Up"

#: templates/elements/login_prompt.html:6
msgid "Sign Up"
msgstr ""

Expand Down Expand Up @@ -1448,8 +1454,8 @@ msgstr ""
"other Pecha users."

#: templates/registration/login.html:14 templates/registration/login.html:15
msgid "You are already logged in as"
msgstr ""
msgid "login_success_message"
msgstr "You are already logged in as {{ user.email }}."

#: templates/registration/login.html:18 templates/registration/login.html:19
msgid "Logout."
Expand Down
Binary file modified locale/he/LC_MESSAGES/django.mo
Binary file not shown.
115 changes: 89 additions & 26 deletions locale/he/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-25 11:21+0530\n"
"POT-Creation-Date: 2024-10-10 17:28+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -243,7 +243,7 @@ msgstr ""
msgid "Sheet ID to delete"
msgstr ""

#: sefaria/forms.py:41 sefaria/forms.py:47 sefaria/forms.py:152
#: sefaria/forms.py:41 sefaria/forms.py:47 sefaria/forms.py:153
#: templates/messages/2022-01-09-user-testing-modal.html:86
#: templates/static/aramaic-translation-contest.html:140
#: templates/static/home.html:362 templates/static/newsletter.html:24
Expand All @@ -268,7 +268,7 @@ msgstr "ཡིག་ཆ་ཞིག་འདེམས།"

#: sefaria/forms.py:56
msgid "Monastic"
msgstr "དགོན་སྡེ།"
msgstr "གྲྭ་བཙུན།"

#: sefaria/forms.py:57
msgid "Teacher"
Expand All @@ -280,37 +280,33 @@ msgstr "སློབ་མ།"

#: sefaria/forms.py:59
msgid "Educated* /Dr / Prof"
msgstr "ཤེས་ལྡན།"
msgstr "བསླབ་པ་མཐར་སོན།"

#: sefaria/forms.py:60
msgid "regular user"
msgstr "སྤྱིར་བཏང་སྤྱོད་མཁན།"
msgstr "དཀྱུས་མ།"

#: sefaria/forms.py:66
msgid "Select an Option"
msgstr "ཡིག་ཆ་ཞིག་འདེམ།"

#: sefaria/forms.py:95
#: sefaria/forms.py:96
msgid "A user with that email already exists."
msgstr ""

#: sefaria/forms.py:143
#: sefaria/forms.py:144
msgid "Incorrect mobile_app_key provided"
msgstr ""

#: sefaria/forms.py:157
#: sefaria/forms.py:158
msgid "New password"
msgstr ""

#: sefaria/forms.py:158
#: sefaria/forms.py:159
msgid "Enter New Password"
msgstr "གསང་ཚིག་གསར་པ།"

#: sefaria/forms.py:163
#: sefaria/forms.py:164
msgid "New password confirmation"
msgstr ""

#: sefaria/forms.py:165
#: sefaria/forms.py:166
msgid "Repeat New Password"
msgstr "ཡང་བསྐྱར།"

Expand Down Expand Up @@ -1066,8 +1062,6 @@ msgid "Older Activity"
msgstr ""

#: templates/elements/login_prompt.html:6
#: templates/registration/register.html:13
#: templates/registration/register.html:22
msgid "Sign Up"
msgstr "ཐོ་འགོད།"

Expand Down Expand Up @@ -1425,7 +1419,7 @@ msgstr ""
msgid "Log back in"
msgstr ""

#: templates/registration/login.html:4 templates/registration/login.html:31
#: templates/registration/login.html:4 templates/registration/login.html:29
msgid "Log in to Pecha"
msgstr "ནང་དུ་འཛུལ་ས།"

Expand All @@ -1435,27 +1429,27 @@ msgid ""
"other Pecha users."
msgstr ""

#: templates/registration/login.html:14 templates/registration/login.html:15
#: templates/registration/login.html:14
msgid "You are already logged in as"
msgstr ""

#: templates/registration/login.html:18 templates/registration/login.html:19
#: templates/registration/login.html:17
msgid "Logout."
msgstr ""

#: templates/registration/login.html:35
#: templates/registration/login.html:33
msgid "Your username and password didn't match. Please try again."
msgstr ""

#: templates/registration/login.html:52 templates/sheets.html:497
#: templates/registration/login.html:50 templates/sheets.html:497
msgid "Login"
msgstr "ནང་འཛུལ་གྱིས།"

#: templates/registration/login.html:55
#: templates/registration/login.html:53
msgid "Forgot your password?"
msgstr "གསང་ཚིག་བརྗེད་སོང་ན། འདིར་སྣུན།"

#: templates/registration/login.html:60
#: templates/registration/login.html:58
msgid "Create a new account"
msgstr "ཁ་བྱང་གསར་པ་ཞིག་བཟོས།"

Expand Down Expand Up @@ -1496,7 +1490,7 @@ msgstr ""
#: templates/registration/password_reset_done.html:10
#: templates/registration/password_reset_done.html:11
msgid "An email has been sent with a link to reset your password."
msgstr ""
msgstr "ཁྱེད་ཀྱི་གློག་འཕྲིན་ནང་། གསང་ཚིག་བསྐྱར་སྒྲིག་གི་དྲ་ཐག་བསྐུར་ཡོད།"

#: templates/registration/password_reset_email.html:4
#: templates/registration/password_reset_email.txt:3
Expand Down Expand Up @@ -1547,7 +1541,15 @@ msgid ""
"other people."
msgstr ""

#: templates/registration/register.html:26
#: templates/registration/register.html:13
msgid "Sign_Up_Title"
msgstr "ཐོ་འགོད་བྱེད་ས།"

#: templates/registration/register.html:25
msgid "Sign_Up_Button"
msgstr "ཐོ་འགོད་གྱིས།"

#: templates/registration/register.html:29
msgid "Already have an account? Log in"
msgstr "ཁ་བྱང་བཟོས་ཡོད་ན། ནང་འཛུལ་བྱེད་ས་འདིར་སྣུན།"

Expand Down Expand Up @@ -2445,5 +2447,66 @@ msgid ""
"verse in his commentary on another."
msgstr ""

#, fuzzy
#~| msgid "Education"
#~ msgid "Syndication"
#~ msgstr "ཤེས་ཚད།"

#, fuzzy
#~| msgid "Education"
#~ msgid "Duration"
#~ msgstr "ཤེས་ཚད།"

#, fuzzy
#~| msgid "Email Address"
#~ msgid "Email address"
#~ msgstr "གློག་འཕྲིན།"

#, fuzzy
#~| msgid "File"
#~ msgid "File path"
#~ msgstr "ཡིག་ཆ།"

#, fuzzy
#~| msgid "Email Address"
#~ msgid "IP address"
#~ msgstr "གློག་འཕྲིན།"

#, fuzzy
#~| msgid "Delete Sheet"
#~ msgid "Delete"
#~ msgstr "ཟིན་བྲིས་འདི་བསུབ།"

#, fuzzy
#~| msgid "Change Email"
#~ msgid "Change"
#~ msgstr "གློག་འཕྲིན་གཞན་པ་བེད་སྤྱོད་བྱེད།"

#, fuzzy
#~| msgid "Student"
#~ msgid "Sun"
#~ msgstr "སློབ་མ།"

#, fuzzy
#~| msgid "Version"
#~ msgid "Permissions"
#~ msgstr "ཐོན་རིམ།"

#, fuzzy
#~| msgid "Password"
#~ msgid "Password:"
#~ msgstr "གསང་ཚིག"

#, fuzzy
#~| msgid "Forgot your password?"
#~ msgid "Forgotten your password or username?"
#~ msgstr "གསང་ཚིག་བརྗེད་སོང་ན། འདིར་སྣུན།"

#~ msgid "Select an Option"
#~ msgstr "ཡིག་ཆ་ཞིག་འདེམ།"

#~ msgid "login_success_message"
#~ msgstr "གློག་འཕྲིན་འདི། {{ user.email }} དཔེ་ཆ་དྲ་བ་ལ་སྤྱོད་བཞིན་འདུག།"

#~ msgid "Select an option..."
#~ msgstr "ཡིག་ཆ་ཞིག་འདེམ།"
44 changes: 44 additions & 0 deletions static/css/s2.css
Original file line number Diff line number Diff line change
Expand Up @@ -11034,6 +11034,50 @@ body #keyboardInputMaster tbody tr td table tbody tr td.pressed {
font-family: "Roboto", "Helvetica Neue", "Helvetica", sans-serif;
}

.pwa-install-button {
padding: 2px 10px;
font-size: 16px;
font-family: Cambria, Cochin, Georgia, Times, 'Times New Roman', serif;
background-color: #b84045;
color: white;
border: var(--talmud-gold) 1px solid;
border-radius: 5px;
cursor: pointer;
position: fixed; /* Fix the position of the button */
left: 50%; /* Center horizontally */
transform: translateX(-50%); /* Adjust to center it exactly */
bottom: 15px; /* Position near the bottom */
transition: background-color 0.3s ease; /* Smooth background change */
display: none; /* Initially hidden */
}

/* Slide-in animation */
.pwa-install-button.show {
display: inline-block;
animation: slide-in 0.10s forwards; /* Trigger the slide-in animation */
}

/* Keyframes for sliding in the button from the right */
@keyframes slide-in {
from {
transform: translateX(100px); /* Start off-screen */
}
to {
transform: translateX(-50%); /* Slide in to the centered position */
}
}

.pwa-install-button:hover {
background-color: #a7353b;
transform: translateX(-50%) scale(1.05); /* Keep centering and enlarge the button on hover */
}

.pwa-install-button:active {
background-color: #8b2c30;
transform: translateX(-50%) scale(0.98); /* Keep centering on active state */
}


#footer .section {
display: inline-block;
vertical-align: top;
Expand Down
5 changes: 5 additions & 0 deletions static/js/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,17 @@ class Footer extends Component {
trackLanguageClick(language){
Sefaria.track.setInterfaceLanguage('interface language footer', language);
}

render() {
if (!Sefaria._siteSettings.TORAH_SPECIFIC) { return null; }

return (
<div id='version_number'>
<InterfaceText>Version: 1.3.0</InterfaceText>
{/* Install PWA Button */}
<button id="install-pwa-button" className="pwa-install-button" style={{ marginLeft: "10px", display: 'none' }}>
Install pecha App
</button>
</div>
);
}
Expand Down
4 changes: 2 additions & 2 deletions static/js/TranslationsBox.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ const TranslationsHeader = () => (
<h3>
<InterfaceText>connection_pannel.translations</InterfaceText>
</h3>
<div className="translationsDesc sans-serif">
{/* <div className="translationsDesc sans-serif">
<InterfaceText>connection_pannel.translation.description</InterfaceText>
<a href="/sheets/36" target="_blank" className="inTextLink">
<InterfaceText>common.learn_more</InterfaceText>
</a>
</div>
</div> */}
</div>
);

Expand Down
Loading

0 comments on commit f48da10

Please sign in to comment.