Yuki Takei 9 лет назад
Родитель
Сommit
8c86cfe7fb

+ 1 - 1
lib/form/me/imagetype.js

@@ -4,5 +4,5 @@ var form = require('express-form')
   , field = form.field;
   , field = form.field;
 
 
 module.exports = form(
 module.exports = form(
-  field('imagetypeForm.isGravaterEnabled').required()
+  field('imagetypeForm.isGravatarEnabled').required()
 );
 );

+ 6 - 6
lib/models/user.js

@@ -11,7 +11,7 @@ module.exports = function(crowi) {
     , STATUS_SUSPENDED  = 3
     , STATUS_SUSPENDED  = 3
     , STATUS_DELETED    = 4
     , STATUS_DELETED    = 4
     , STATUS_INVITED    = 5
     , STATUS_INVITED    = 5
-    , USER_PUBLIC_FIELDS = '_id image isGravaterEnabled googleId name username email introduction status lang createdAt admin' // TODO: どこか別の場所へ...
+    , USER_PUBLIC_FIELDS = '_id image isGravatarEnabled googleId name username email introduction status lang createdAt admin' // TODO: どこか別の場所へ...
 
 
     , LANG_EN    = 'en'
     , LANG_EN    = 'en'
     , LANG_EN_US = 'en-US'
     , LANG_EN_US = 'en-US'
@@ -27,7 +27,7 @@ module.exports = function(crowi) {
   userSchema = new mongoose.Schema({
   userSchema = new mongoose.Schema({
     userId: String,
     userId: String,
     image: String,
     image: String,
-    isGravaterEnabled: { type: Boolean, default: false },
+    isGravatarEnabled: { type: Boolean, default: false },
     googleId: String,
     googleId: String,
     name: { type: String },
     name: { type: String },
     username: { type: String, index: true },
     username: { type: String, index: true },
@@ -138,8 +138,8 @@ module.exports = function(crowi) {
     });
     });
   };
   };
 
 
-  userSchema.methods.updateIsGravaterEnabled = function(isGravaterEnabled, callback) {
-    this.isGravaterEnabled = isGravaterEnabled;
+  userSchema.methods.updateIsGravatarEnabled = function(isGravatarEnabled, callback) {
+    this.isGravatarEnabled = isGravatarEnabled;
     this.save(function(err, userData) {
     this.save(function(err, userData) {
       return callback(err, userData);
       return callback(err, userData);
     });
     });
@@ -581,7 +581,7 @@ module.exports = function(crowi) {
 
 
           newUser.email = email;
           newUser.email = email;
           newUser.setPassword(password);
           newUser.setPassword(password);
-          newUser.isGravaterEnabled = true;   // Gravater enabled in default
+          newUser.isGravatarEnabled = true;   // Gravatar enabled in default
           newUser.createdAt = Date.now();
           newUser.createdAt = Date.now();
           newUser.status = STATUS_INVITED;
           newUser.status = STATUS_INVITED;
 
 
@@ -658,7 +658,7 @@ module.exports = function(crowi) {
     newUser.email = email;
     newUser.email = email;
     newUser.setPassword(password);
     newUser.setPassword(password);
     newUser.lang = lang;
     newUser.lang = lang;
-    newUser.isGravaterEnabled = true;   // Gravater enabled in default
+    newUser.isGravatarEnabled = true;   // Gravatar enabled in default
     newUser.createdAt = Date.now();
     newUser.createdAt = Date.now();
     newUser.status = decideUserStatusOnRegistration();
     newUser.status = decideUserStatusOnRegistration();
 
 

+ 2 - 2
lib/routes/me.js

@@ -127,9 +127,9 @@ module.exports = function(crowi, app) {
     var imagetypeForm = req.body.imagetypeForm;
     var imagetypeForm = req.body.imagetypeForm;
     var userData = req.user;
     var userData = req.user;
 
 
-    var isGravaterEnabled = imagetypeForm.isGravaterEnabled;
+    var isGravatarEnabled = imagetypeForm.isGravatarEnabled;
 
 
-    userData.updateIsGravaterEnabled(isGravaterEnabled, function(err, userData) {
+    userData.updateIsGravatarEnabled(isGravatarEnabled, function(err, userData) {
       if (err) {
       if (err) {
         for (var e in err.errors) {
         for (var e in err.errors) {
           if (err.errors.hasOwnProperty(e)) {
           if (err.errors.hasOwnProperty(e)) {

+ 3 - 3
lib/util/middlewares.js

@@ -59,7 +59,7 @@ exports.swigFunctions = function(crowi, app) {
 
 
 exports.swigFilters = function(app, swig) {
 exports.swigFilters = function(app, swig) {
 
 
-  // define a function for Gravater
+  // define a function for Gravatar
   const generateGravatarSrc = function(user) {
   const generateGravatarSrc = function(user) {
     const hash = md5(user.email.trim().toLowerCase());
     const hash = md5(user.email.trim().toLowerCase());
     return `http://www.gravatar.com/avatar/${hash}`;
     return `http://www.gravatar.com/avatar/${hash}`;
@@ -150,7 +150,7 @@ exports.swigFilters = function(app, swig) {
         .replace(/\s(https?.+(jpe?g|png|gif))\s/, '\n\n\n![]($1)\n\n\n');
         .replace(/\s(https?.+(jpe?g|png|gif))\s/, '\n\n\n![]($1)\n\n\n');
     });
     });
 
 
-    swig.setFilter('gravater', generateGravatarSrc);
+    swig.setFilter('gravatar', generateGravatarSrc);
     swig.setFilter('uploadedpicture', getUploadedPictureSrc);
     swig.setFilter('uploadedpicture', getUploadedPictureSrc);
 
 
     swig.setFilter('picture', function(user) {
     swig.setFilter('picture', function(user) {
@@ -158,7 +158,7 @@ exports.swigFilters = function(app, swig) {
         return '';
         return '';
       }
       }
 
 
-      if (user.isGravaterEnabled === true) {
+      if (user.isGravatarEnabled === true) {
         return generateGravatarSrc(user);
         return generateGravatarSrc(user);
       }
       }
       else {
       else {

+ 4 - 4
lib/views/me/index.html

@@ -102,21 +102,21 @@
         <div class="form-group col-sm-offset-1 col-sm-3">
         <div class="form-group col-sm-offset-1 col-sm-3">
           <div class="radio">
           <div class="radio">
             <h4>
             <h4>
-              <input type="radio" name="imagetypeForm[isGravaterEnabled]" value="true" {% if user.isGravaterEnabled %}checked="checked"{% endif %}>
-              <img src="https://www.gravatar.com/avatar/00000000000000000000000000000000?s=24" /> Gravater
+              <input type="radio" name="imagetypeForm[isGravatarEnabled]" value="true" {% if user.isGravatarEnabled %}checked="checked"{% endif %}>
+              <img src="https://www.gravatar.com/avatar/00000000000000000000000000000000?s=24" /> Gravatar
               <a href="https://gravatar.com/">
               <a href="https://gravatar.com/">
                 <small><i class="fa fa-external-link" aria-hidden="true"></i></small>
                 <small><i class="fa fa-external-link" aria-hidden="true"></i></small>
               </a>
               </a>
             </h4>
             </h4>
           </div>
           </div>
 
 
-          <img src="{{ user|gravater }}" width="64">
+          <img src="{{ user|gravatar }}" width="64">
         </div><!-- /.col-sm* -->
         </div><!-- /.col-sm* -->
 
 
         <div class="form-group col-sm-8">
         <div class="form-group col-sm-8">
           <div class="radio">
           <div class="radio">
             <h4>
             <h4>
-              <input type="radio" name="imagetypeForm[isGravaterEnabled]" value="false" {% if !user.isGravaterEnabled  %}checked="checked"{% endif %}>{{ t('Upload Image') }}
+              <input type="radio" name="imagetypeForm[isGravatarEnabled]" value="false" {% if !user.isGravatarEnabled  %}checked="checked"{% endif %}>{{ t('Upload Image') }}
             </h4>
             </h4>
           </div>
           </div>
           <div class="form-group">
           <div class="form-group">

+ 3 - 3
resource/js/components/User/UserPicture.js

@@ -5,9 +5,9 @@ import md5 from 'md5';
 export default class UserPicture extends React.Component {
 export default class UserPicture extends React.Component {
 
 
   getUserPicture(user) {
   getUserPicture(user) {
-    // gravater
-    if (user.isGravaterEnabled === true) {
-      console.log(user.username + ": isGravaterEnabled true");
+    // gravatar
+    if (user.isGravatarEnabled === true) {
+      console.log(user.username + ": isGravatarEnabled true");
       return this.generateGravatarSrc(user);
       return this.generateGravatarSrc(user);
     }
     }
     // uploaded image
     // uploaded image