Merge branch 'master' of github.com:diaspora/diaspora
This commit is contained in:
Dan Hansen
commit
45444316cb
38 changed files with 68 additions and 7 deletions
|
|
@ -12,7 +12,7 @@
|
|||
- elsif (contact && contact.pending) || request
|
||||
= t('.pending_request')
|
||||
- else
|
||||
= link_to "start sharing",
|
||||
= link_to t('people.show.start_sharing'),
|
||||
{:controller => "people",
|
||||
:action => "share_with",
|
||||
:id => person.id},
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#author_info
|
||||
- unless @contact || current_user.person == @person
|
||||
.right
|
||||
= link_to "start sharing",
|
||||
= link_to t('.start_sharing'),
|
||||
{:controller => "people",
|
||||
:action => "share_with",
|
||||
:id => @person.id},
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ de:
|
|||
change_password: "Mein Passwort ändern"
|
||||
new:
|
||||
forgot_password: "Passwort vergessen?"
|
||||
no_account: "No account with this email exsists. If you are waiting for an invite, we are rolling them out as soon as possible"
|
||||
no_account: "Es existiert kein Benutzerkonto mit dieser E-Mail-Adresse. Falls du auf eine Einladung wartest, dann geben wir dir eine sobald wie möglich."
|
||||
send_password_instructions: "Anleitung zum Zurücksetzen des Passworts anfordern"
|
||||
send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Passwort zurücksetzt."
|
||||
updated: "Dein Passwort wurde erfolgreich geändert. Du bist nun angemeldet."
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ ar:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Return to your aspects page"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "to accept or ignore it."
|
||||
update:
|
||||
failed: "Error al actualizar el perfil"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ ca:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Tornar als teus aspectes"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "acceptar o ignorar."
|
||||
update:
|
||||
failed: "No s'ha pogut actualitzar el teu perfil"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ cs:
|
|||
recent_public_posts: "Poslední veřejné příspěvky"
|
||||
return_to_aspects: "Návrat na vaši stránku s aspekty"
|
||||
similar_contacts: "podobné kontakty"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "přijmout nebo ignorovat."
|
||||
update:
|
||||
failed: "Aktualizace profilu selhala"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ cy:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Return to your aspects page"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "to accept or ignore it."
|
||||
update:
|
||||
failed: "Failed to update profile"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ da:
|
|||
recent_public_posts: "Seneste offentlige indlæg"
|
||||
return_to_aspects: "Tilbage til aspektsoversigt"
|
||||
similar_contacts: "lignende kontakter"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "at godkende eller ignorere det."
|
||||
update:
|
||||
failed: "Kunne ikke opdatere profil"
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ de:
|
|||
to: "An"
|
||||
layouts:
|
||||
application:
|
||||
have_a_problem: "Du hast ein Problem? Finde eine Antowort hier (Englisch)"
|
||||
have_a_problem: "Du hast ein Problem? Finde hier eine Antwort (Englisch)"
|
||||
powered_by: "BETRIEBEN MIT DIASPORA*"
|
||||
whats_new: "Was gibt’s Neues?"
|
||||
header:
|
||||
|
|
@ -269,6 +269,7 @@ de:
|
|||
recent_public_posts: "Neueste öffentliche Beiträge"
|
||||
return_to_aspects: "Kehre zur Aspekt-Übersicht zurück."
|
||||
similar_contacts: "ähnliche Kontakte"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "um zu akzeptieren oder zu ignorieren."
|
||||
update:
|
||||
failed: "Ändern des Profils fehlgeschlagen"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ el:
|
|||
recent_public_posts: "Πρόσφατες Δημόσιες Δημοσιεύσεις"
|
||||
return_to_aspects: "Επιστροφή στη σελίδα με τις πτυχές σας"
|
||||
similar_contacts: "παρόμοιες επαφές"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "να το αποδεχθεί ή να το αγνοήσει."
|
||||
update:
|
||||
failed: "Αποτυχία ενημέρωσης προφίλ"
|
||||
|
|
|
|||
|
|
@ -360,6 +360,7 @@ en:
|
|||
recent_posts: "Recent Posts"
|
||||
recent_public_posts: "Recent Public Posts"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
edit:
|
||||
info_available_to: "This info will be available to whomever you connect with on Diaspora."
|
||||
your_profile: "Your profile"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ en_shaw:
|
|||
recent_public_posts: "𐑮𐑰𐑕𐑩𐑯𐑑 𐑐𐑳𐑚𐑤𐑦𐑒 𐑐𐑴𐑕𐑑𐑕"
|
||||
return_to_aspects: "𐑮𐑦𐑑𐑻𐑯 𐑑 𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑𐑕 𐑐𐑱𐑡"
|
||||
similar_contacts: "𐑕𐑦𐑥𐑦𐑤𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "𐑑 𐑩𐑒𐑕𐑧𐑐𐑑 𐑹 𐑦𐑜𐑯𐑹 𐑦𐑑."
|
||||
update:
|
||||
failed: "𐑓𐑱𐑤𐑛 𐑑 𐑳𐑐𐑛𐑱𐑑 𐑐𐑮𐑴𐑓𐑲𐑤"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ eo:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Return to your aspects page"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "to accept or ignore it."
|
||||
update:
|
||||
failed: "Failed to update profile"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ es-CL:
|
|||
recent_public_posts: "Posteos Públicos Recientes"
|
||||
return_to_aspects: "Volver a tu página de aspectos"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "aceptar o ignorar."
|
||||
update:
|
||||
failed: "Error al actualizar perfil"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ es:
|
|||
recent_public_posts: "Comentarios públicos recientes"
|
||||
return_to_aspects: "Volver a tus aspectos"
|
||||
similar_contacts: "contactos similares"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "aceptar o ignorar."
|
||||
update:
|
||||
failed: "No se pudo actualizar el perfil"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ fi:
|
|||
recent_public_posts: "Viimeisimmät julkiset tapahtumat"
|
||||
return_to_aspects: "Palaa näkymiin"
|
||||
similar_contacts: "Yhteiset kontaktit"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "hyväksyäksesi, tai hylätäksesi sen."
|
||||
update:
|
||||
failed: "Profiilin päivittäminen epäonnistui"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ fr:
|
|||
recent_public_posts: "Messages publics récents"
|
||||
return_to_aspects: "Retourner à votre page des aspects"
|
||||
similar_contacts: "Contacts similaires"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "pour l'accepter ou l'ignorer."
|
||||
update:
|
||||
failed: "La mise à jour du profil a échoué"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ ga:
|
|||
recent_public_posts: "Póstanna Phoiblí Déanaí"
|
||||
return_to_aspects: "Dul siar chuig leathanach gnéithe"
|
||||
similar_contacts: "teagmháillí cosúil"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "chun glacadh leis nó neamhaird a dhéanamh de"
|
||||
update:
|
||||
failed: "Níor éirigh le do próifíl a nuashonrú"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ gl-ES:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Return to your aspects page"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "to accept or ignore it."
|
||||
update:
|
||||
failed: "Non se puido actualizar o perfil"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ he:
|
|||
recent_public_posts: "הרשומות הציבוריות האחרונות"
|
||||
return_to_aspects: "באפשרותך לחזור לעמוד ההיבטים שלך"
|
||||
similar_contacts: "אנשי קשר דומים"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "כדי לקבל או לדחות אותה."
|
||||
update:
|
||||
failed: "אירע כשל בעדכון הפרופיל"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ hu:
|
|||
recent_public_posts: "Legutóbbi nyilvános hozzászólások"
|
||||
return_to_aspects: "Menj vissza a csoportokhoz"
|
||||
similar_contacts: "hasonló kapcsolatok"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "hogy elfogadd vagy elutasítsd."
|
||||
update:
|
||||
failed: "Profil frissítése sikertelen"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ id:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Return to your aspects page"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "to accept or ignore it."
|
||||
update:
|
||||
failed: "Failed to update profile"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ it:
|
|||
recent_public_posts: "Post pubblici recenti"
|
||||
return_to_aspects: "Torna alla pagina dei tuoi aspetti"
|
||||
similar_contacts: "contatti simili"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "per accettarla o ignorarla."
|
||||
update:
|
||||
failed: "Impossibile aggiornare il profilo"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ lt:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Grįžti į aspektų puslapį"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "priimti arba ignoruoti."
|
||||
update:
|
||||
failed: "Nepavyko atnaujinti profilio"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ mk:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Return to your aspects page"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "to accept or ignore it."
|
||||
update:
|
||||
failed: "Неуспешно ажурирање на профил"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ nb:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Return to your aspects page"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "to accept or ignore it."
|
||||
update:
|
||||
failed: "Failed to update profile"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ nl:
|
|||
recent_public_posts: "Recente Openbare Berichten"
|
||||
return_to_aspects: "Ga terug naar je aspecten pagina"
|
||||
similar_contacts: "vergelijkbare contacten"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "om te accepteren of te negeren."
|
||||
update:
|
||||
failed: "Updaten van profiel mislukt"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ pl:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Wróć do strony aspektów"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "by je przyjąć lub zignorować."
|
||||
update:
|
||||
failed: "Nie udało się zaktualizować profilu"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ pt-BR:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Retornar à sua página de aspectos"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "para aceitar ou ignorar."
|
||||
update:
|
||||
failed: "Erro ao atualizar perfil"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ pt-PT:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Voltar à página dos grupos"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "para o aceitares ou ignorares"
|
||||
update:
|
||||
failed: "Falha ao actualizar o perfil"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ ro:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Return to your aspects page"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "to accept or ignore it."
|
||||
update:
|
||||
failed: "Failed to update profile"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ ru:
|
|||
recent_public_posts: "Последние Публичные Посты"
|
||||
return_to_aspects: "Вернуться на страницу аспектов"
|
||||
similar_contacts: "аналогичные контакты"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "принять или игнорировать."
|
||||
update:
|
||||
failed: "Не удалось обновить профиль"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ sk:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Vrátiť sa na stránku aspektov"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "akceptovať, alebo ignorovať."
|
||||
update:
|
||||
failed: "Aktualizácia profilu zlyhala"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ sl:
|
|||
recent_public_posts: "Zadnje javne objave"
|
||||
return_to_aspects: "Vrnite se na vašo stran s skupinami"
|
||||
similar_contacts: "podobni stiki"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "sprejmite ali zavrnite."
|
||||
update:
|
||||
failed: "Posodobitev profila ni uspelo"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ sv:
|
|||
recent_public_posts: "Senaste publika inlägg"
|
||||
return_to_aspects: "Återgå till översikten"
|
||||
similar_contacts: "liknande kontakter"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "for att acceptera eller ignorera."
|
||||
update:
|
||||
failed: "Misslyckades med att uppdatera profilen"
|
||||
|
|
|
|||
|
|
@ -269,6 +269,7 @@ tr:
|
|||
recent_public_posts: "Recent Public Posts"
|
||||
return_to_aspects: "Return to your aspects page"
|
||||
similar_contacts: "similar contacts"
|
||||
start_sharing: "start sharing"
|
||||
to_accept_or_ignore: "to accept or ignore it."
|
||||
update:
|
||||
failed: "Failed to update profile"
|
||||
|
|
|
|||
|
|
@ -117,7 +117,10 @@ $(document).ready(function(){
|
|||
|
||||
|
||||
// set url
|
||||
history.pushState(null, document.title, newURL);
|
||||
// some browsers (Firefox for example) don't support pushState
|
||||
if (typeof(history.pushState) == 'function') {
|
||||
history.pushState(null, document.title, newURL);
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
url : newURL,
|
||||
|
|
|
|||
|
|
@ -7,8 +7,10 @@ realpath=$( ruby -e "puts File.expand_path(\"$0\")")
|
|||
cd $( dirname $realpath)/..
|
||||
OS=`uname -s`
|
||||
|
||||
|
||||
[ -e config/server.sh ] && source config/server.sh
|
||||
|
||||
|
||||
function init_public
|
||||
# Create all dynamically generated files in public/ folder
|
||||
{
|
||||
|
|
@ -20,7 +22,12 @@ function init_public
|
|||
wget -q -O tmp/server.html http://localhost:$THIN_PORT && \
|
||||
rm tmp/server.html && break
|
||||
done
|
||||
bundle exec thin --pid log/thin.pid stop
|
||||
if [ -e 'log/thin.pid' ]; then
|
||||
bundle exec thin --pid log/thin.pid stop
|
||||
else
|
||||
echo "Warning: Something is wrong in your installation, thin didn't come up for the first time initialization!" >&2
|
||||
echo "Try starting it manually with bundle exec thin start and look at the output." >&2
|
||||
fi
|
||||
if [ -e tmp/server.html ]; then
|
||||
echo "Cannot get index.html from web server (aborted)" >&2
|
||||
return 2
|
||||
|
|
@ -28,6 +35,7 @@ function init_public
|
|||
bundle exec jammit
|
||||
}
|
||||
|
||||
|
||||
function chk_service
|
||||
{
|
||||
port=${1:?Missing port}
|
||||
|
|
@ -43,6 +51,7 @@ function chk_service
|
|||
esac
|
||||
}
|
||||
|
||||
|
||||
function redis_config
|
||||
# Create/update the local redis.conf file from /etc master
|
||||
{
|
||||
|
|
@ -75,6 +84,7 @@ function redis_config
|
|||
config/redis.conf
|
||||
}
|
||||
|
||||
|
||||
# Scan for -p, find out what port thin is about to use.
|
||||
args="$DEFAULT_THIN_ARGS $@"
|
||||
prev_arg=''
|
||||
|
|
@ -84,6 +94,7 @@ do
|
|||
prev_arg="$arg"
|
||||
done
|
||||
|
||||
|
||||
# Is someone listening on the ports already? (ipv4 only test ?)
|
||||
services=$( chk_service $THIN_PORT )
|
||||
if [ -n "$services" ]; then
|
||||
|
|
@ -110,6 +121,7 @@ fi
|
|||
|
||||
redis_config
|
||||
|
||||
|
||||
# Force AGPL
|
||||
if [ -w public -a ! -e public/source.tar.gz ]; then
|
||||
branch=$( git branch | awk '/^[*]/ {print $2}')
|
||||
|
|
@ -120,6 +132,19 @@ if [ ! -e public/source.tar.gz ]; then
|
|||
exit 65
|
||||
fi
|
||||
|
||||
|
||||
# Check if config files exists
|
||||
if [ ! -e 'config/app_config.yml' ]; then
|
||||
echo "config/app_config.yml is missing! Copy over config/app_config.yml.example to config/app_config.yml and edit it properly!" >&2
|
||||
exit 67
|
||||
fi
|
||||
|
||||
if [ ! -e 'config/database.yml' ]; then
|
||||
echo 'config/database.yml is missing! Copy over config/database.yml.example to config/database.yml and edit it properly!' >&2
|
||||
exit 68
|
||||
fi
|
||||
|
||||
|
||||
# Precache jammit assets
|
||||
if [[ -w public && ! -e 'public/stylesheets/application.css' ]]; then
|
||||
if [ "$INIT_PUBLIC" != 'no' ]; then
|
||||
|
|
@ -127,9 +152,9 @@ if [[ -w public && ! -e 'public/stylesheets/application.css' ]]; then
|
|||
init_public
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -e 'public/stylesheets/application.css' ]; then
|
||||
echo 'Jammit precache error (now or at install)' >&2
|
||||
exit 66
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue